diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-02 19:37:23 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-02 19:37:24 +0300 |
| commit | 8bfb359844cf51aedaf0d28486d4ce9867ccb46c (patch) | |
| tree | f8bafe397c5166cf1b67981727fa504d7cfa057a /sequencer.c | |
| parent | 52d9dc20e1ddd5ac6b9e9113983b2f8d6977e6b0 (diff) | |
| parent | 9645a087c2e848b8f48d03a3ae3222c5d5aa8261 (diff) | |
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index cc9821ece2..adc9cfb4df 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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; |