Permalink
Browse files

Merge pull request #6692

3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Sep 18, 2015
2 parents 8bc1b3a + 3802ae7 commit d5d1d2e65a1c3b91452d2428410f701bca1e53cc
Showing with 5 additions and 1 deletion.
  1. +5 −1 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."

0 comments on commit d5d1d2e

Please sign in to comment.