pick-to-branch: Fix behavior on failed cherry-pick

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/tools/pull/95)

diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index 792877787416af9dc686f037e4a668546895a91a..d1bcc9ca76bd916d78bb142c2353a48cdec0c147 100755 (executable)
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -94,7 +94,7 @@ trap 'cleanup' EXIT
 
 git checkout --quiet master
 git checkout $branch
-git cherry-pick -e -x $id
+git cherry-pick -e -x $id || (git cherry-pick --abort; exit 1)
 
 while true
 do