diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-18 16:01:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-18 16:02:01 +0200 |
| commit | d5d1d2e65a1c3b91452d2428410f701bca1e53cc (patch) | |
| tree | 397ba6a3beaba5e1059ef37e386f33a6c4e830eb | |
| parent | 8bc1b3a1f37b86014bca583f8e33a5dd75772019 (diff) | |
| parent | 3802ae72670faf46c96d0f5f262e42cae92c5a42 (diff) | |
| download | bitcoin-d5d1d2e65a1c3b91452d2428410f701bca1e53cc.tar.xz | |
Merge pull request #6692
3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
| -rwxr-xr-x | contrib/devtools/github-merge.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh index ec7a1f4c4b..afb53f0390 100755 --- 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." |