diff options
| -rwxr-xr-x | apply-pullreq | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/apply-pullreq b/apply-pullreq index a5528e4..b0e8860 100755 --- a/apply-pullreq +++ b/apply-pullreq @@ -58,6 +58,17 @@ if [ "$(git rev-parse master)" != "$(git rev-parse staging)" ]; then exit 1 fi +# Check we're not accidentally trying to merge after the +# final release was tagged and before we reopened the devtree. +VER="$(cat VERSION)" +VERMIN="${VER##*.}" + +if [ "$VERMIN" = "0" ]; then + echo "VERSION says this a release version: forgot to reopen devtree?" + exit 1 +fi + + # Find the remote name corresponding to the URL. Note that we # assume that any protocol on the remote is the same thing, and # that a trailing ".git" makes no difference. This helps when @@ -104,6 +115,12 @@ if git diff master..staging | grep -q 'Subproject commit'; then echo "WARNING: pull appears to include submodule update, please check it!" fi +# Check whether any authors needs to be corrected after SPF rewrites +if git shortlog --author=qemu-devel@nongnu.org master..staging | grep .; then + echo "ERROR: pull request includes commits attributed to list" + exit 1 +fi + # This should exit with an error status if any of the sub-builds fails. parallel-buildtest |