Merge pull request #6692

3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2015-09-18 16:01:45 +02:00
commit d5d1d2e65a
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -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."