aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-09-18 06:03:17 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-09-18 06:03:17 +0200
commit3802ae72670faf46c96d0f5f262e42cae92c5a42 (patch)
tree397ba6a3beaba5e1059ef37e386f33a6c4e830eb /contrib
parent8bc1b3a1f37b86014bca583f8e33a5dd75772019 (diff)
devtools: don't push if signing fails in github-merge
If a problem happens with gpg, exit prematurely so that it doesn't push the branch upstream.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/devtools/github-merge.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh
index ec7a1f4c4b..afb53f0390 100755
--- a/contrib/devtools/github-merge.sh
+++ b/contrib/devtools/github-merge.sh
@@ -161,7 +161,11 @@ if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then
cleanup
exit 1
else
- git commit -q --gpg-sign --amend --no-edit
+ if ! git commit -q --gpg-sign --amend --no-edit; then
+ echo "Error signing, exiting."
+ cleanup
+ exit 1
+ fi
fi
else
echo "Not signing off on merge, exiting."