Browse Source

Merge pull request #6692

3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
d5d1d2e65a
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 6
      contrib/devtools/github-merge.sh

6
contrib/devtools/github-merge.sh

@ -161,7 +161,11 @@ if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then
cleanup cleanup
exit 1 exit 1
else 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 fi
else else
echo "Not signing off on merge, exiting." echo "Not signing off on merge, exiting."

Loading…
Cancel
Save