Merge pull request #6692

3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
2015-09-18 16:01:45 +02:00 · 2015-09-18 16:01:45 +02:00 · d5d1d2e65a
parent 8bc1b3a1f3 3802ae7267
commit d5d1d2e65a
1 changed files with 5 additions and 1 deletions
--- 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."