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 9e4bc7dd1b
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
c5f448b0f2
commit
f0ef05967f
@ -54,8 +54,13 @@ continue_merge () {
|
|||||||
|
|
||||||
if test -n "`git-diff-index HEAD`"
|
if test -n "`git-diff-index HEAD`"
|
||||||
then
|
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
|
printf "Committed: %0${prec}d" $msgnum
|
||||||
git-commit -C "`cat $dotest/current`"
|
|
||||||
else
|
else
|
||||||
printf "Already applied: %0${prec}d" $msgnum
|
printf "Already applied: %0${prec}d" $msgnum
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user