diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-23 11:27:46 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-23 11:28:08 +0100 |
| commit | 66ef824a9fb382871abb2db127fba9b53bb7b90f (patch) | |
| tree | 9d97fc434313a078d8b1cc6e89e46990ce328d04 | |
| parent | 146e68059cf3ce5772a5f0dc93dcc785a7b64bcf (diff) | |
| parent | 39c809942d7e526a25dde470cd5e95e43fd7a774 (diff) | |
Merge pull request #5517
39c8099 contrib: make github-merge require signing (Wladimir J. van der Laan)
| -rwxr-xr-x | contrib/devtools/github-merge.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh index 6f68496ed8..ec7a1f4c4b 100755 --- a/contrib/devtools/github-merge.sh +++ b/contrib/devtools/github-merge.sh @@ -156,12 +156,17 @@ read -p "Press 's' to sign off on the merge. " -n 1 -r >&2 echo if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then if [[ "$(git config --get user.signingkey)" == "" ]]; then - echo "WARNING: No GPG signing key set, not signing. Set one using:" >&2 + echo "ERROR: No GPG signing key set, not signing. Set one using:" >&2 echo "git config --global user.signingkey <key>" >&2 - git commit -q --signoff --amend --no-edit + cleanup + exit 1 else git commit -q --gpg-sign --amend --no-edit fi +else + echo "Not signing off on merge, exiting." + cleanup + exit 1 fi # Clean up temporary branches, and put the result in $BRANCH. |