Skip to content

Commit f245ae0

Browse files
committed
sequencer (rebase -i): the todo can be empty when continuing
When the last command of an interactive rebase fails, the user needs to resolve the problem and then continue the interactive rebase. Naturally, the todo script is empty by then. So let's not complain about that! Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 41b10d5 commit f245ae0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

sequencer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,8 @@ static int parse_insn_buffer(char *buf, struct todo_list *todo_list,
11531153
fixup_okay = 1;
11541154
p = *eol ? eol + 1 : eol;
11551155
}
1156-
if (!todo_list->nr)
1156+
if (!todo_list->nr && (opts->action != REPLAY_INTERACTIVE_REBASE ||
1157+
!file_exists(git_path_rebase_done())))
11571158
return error(_("No commits parsed."));
11581159
return 0;
11591160
}

0 commit comments

Comments
 (0)