Merge branch 'ah/sequencer-rewrite-todo-fix'
When the user edits "rebase -i" todo file so that it starts with a "fixup", which would make it invalid, the command truncated the rest of the file before giving an error and returning the control back to the user. Stop truncating to make it easier to correct such a malformed todo file. * ah/sequencer-rewrite-todo-fix: sequencer: finish parsing the todo list despite an invalid first line
This commit is contained in:
@ -2702,7 +2702,7 @@ int todo_list_parse_insn_buffer(struct repository *r, char *buf,
|
||||
if (fixup_okay)
|
||||
; /* do nothing */
|
||||
else if (is_fixup(item->command))
|
||||
return error(_("cannot '%s' without a previous commit"),
|
||||
res = error(_("cannot '%s' without a previous commit"),
|
||||
command_to_string(item->command));
|
||||
else if (!is_noop(item->command))
|
||||
fixup_okay = 1;
|
||||
|
Reference in New Issue
Block a user