Skip to content

Commit 9336281

Browse files
dschogitster
authored andcommitted
rebase: do not continue when the todo list generation failed
This is a *really* long-standing bug. As a matter of fact, this bug has been with us from the very beginning of `rebase -i`: 1b1dce4 (Teach rebase an interactive mode, 2007-06-25), where the output of `rev-list` was piped to `sed` (and any failure of the `rev-list` process would go completely undetected). Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 29533fb commit 9336281

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-rebase--interactive.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,8 @@ fi
893893
if test t != "$preserve_merges"
894894
then
895895
git rebase--helper --make-script ${keep_empty:+--keep-empty} \
896-
$revisions ${restrict_revision+^$restrict_revision} >"$todo"
896+
$revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
897+
die "$(gettext "Could not generate todo list")"
897898
else
898899
format=$(git config --get rebase.instructionFormat)
899900
# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse

0 commit comments

Comments
 (0)