From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 11 Jun 2015 22:15:46 +0000 (+1000)
Subject: do_merge: Pause when the commit fails
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=cd84af4a2c2976ab86a8462cfe54520ddfa27cab;p=next-scripts

do_merge: Pause when the commit fails
---

diff --git a/do_merge b/do_merge
index 47e02d8..f463e60 100755
--- a/do_merge
+++ b/do_merge
@@ -136,7 +136,9 @@ for h in $heads; do
 				bash -i || exit
 			}
 #			[ "$(git status --porcelain)" ] && {
-				GIT_EDITOR=: execute git commit -v -a
+				GIT_EDITOR=: execute git commit -v -a || {
+					bash -i || exit
+				}
 				execute git diff -M --stat --summary 'HEAD^..'
 #			}
 		}