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@xxxxxxxx> --- I've grown used to having 'set -e' at the beginning of my shell scripts. IMHO it'd be a good idea to start moving towards this eventually (even though shell scripts seem to be getting phased-out somewhat). git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 9ad1c44..47c8e8f 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -59,8 +59,8 @@ continue_merge () { if test -n "`git-diff-index HEAD`" then + git-commit -C "`cat $dotest/current`" || die 'Commit failed' printf "Committed: %0${prec}d" $msgnum - git-commit -C "`cat $dotest/current`" else printf "Already applied: %0${prec}d" $msgnum fi -- 1.4.1.rc1.g3cc8 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html