Merge pull request #6692

3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
bitcoin · Sep 18, 2015 · d5d1d2e · d5d1d2e
2 parents 8bc1b3a + 3802ae7
commit d5d1d2e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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."