Skip to content

Commit d5d1d2e

Browse files
committed
Merge pull request #6692
3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
2 parents 8bc1b3a + 3802ae7 commit d5d1d2e

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

contrib/devtools/github-merge.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,11 @@ if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then
161161
cleanup
162162
exit 1
163163
else
164-
git commit -q --gpg-sign --amend --no-edit
164+
if ! git commit -q --gpg-sign --amend --no-edit; then
165+
echo "Error signing, exiting."
166+
cleanup
167+
exit 1
168+
fi
165169
fi
166170
else
167171
echo "Not signing off on merge, exiting."

0 commit comments

Comments
 (0)