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>
Eric Wong committed
Jun 28, 2006 at 03:24 UTC
f0ef05967f3b261fb16f5fdea6dd104c9bdb4c8c
1 file changed
+6
-1
git-rebase.sh
+6
-1
@@ -54,8 +54,13 @@ continue_merge () {
54
55
if test -n "`git-diff-index HEAD`"
56
then
57
+ if ! git-commit -C "`cat $dotest/current`"
58
+ then
59
+ echo "Commit failed, please do not call \"git commit\""
60
+ echo "directly, but instead do one of the following: "
61
+ die "$RESOLVEMSG"
62
+ fi
63
printf "Committed: %0${prec}d" $msgnum
58
- git-commit -C "`cat $dotest/current`"
64
else
65
printf "Already applied: %0${prec}d" $msgnum
66
fi