rebase: check for errors from git-commit

PATCH In review Eric Wong 1 participant 1 message Jun 15, 2016

Share & tools

Eric Wong

author

2016-06-15 22:42 UTC #0 lore raw

PATCH 1/2 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 <[email protected]>

---
 git-rebase.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

git-rebase.sh +6 -1

index 9ad1c44..28860fc 100755
@@ -59,8 +59,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

Signature · 1 line

1.4.1.rc1.gc7c5