highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 07:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6692

Browse Source 
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
parent 8bc1b3a1f3 3802ae7267
commit d5d1d2e65a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/devtools/github-merge.sh
View File

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