From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 28 Jun 2006 10:24:23 +0000 (-0700)
Subject: rebase: check for errors from git-commit
X-Git-Tag: v1.4.1-rc2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0ef05967f3b261fb16f5fdea6dd104c9bdb4c8c;p=git.git

rebase: check for errors from git-commit

commit does not always succeed, so we'll have to check for
it in the absence of set -e.  This fixes a regression
introduced in 9e4bc7dd1bb9d92491c475cec55147fa0b3f954d

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index fd0e7c498..3945e0671 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -54,8 +54,13 @@ continue_merge () {
 
 	if test -n "`git-diff-index HEAD`"
 	then
+		if ! git-commit -C "`cat $dotest/current`"
+		then
+			echo "Commit failed, please do not call \"git commit\""
+			echo "directly, but instead do one of the following: "
+			die "$RESOLVEMSG"
+		fi
 		printf "Committed: %0${prec}d" $msgnum
-		git-commit -C "`cat $dotest/current`"
 	else
 		printf "Already applied: %0${prec}d" $msgnum
 	fi