diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2018-10-25 22:47:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 10:20:23 +0900 |
| commit | 3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db (patch) | |
| tree | 845fa7bba14ed40fbc833f3f7a999a684ffd1557 /sequencer.c | |
| parent | 71f82465b1c9546a09c442c3c9aa22ecbb76f820 (diff) | |
| download | git-3a4a4cab3ef024e10af7a5bbcaed4b961c60f1db.tar.gz | |
rebase -i: recognize short commands without arguments
The sequencer instruction 'b', short for 'break', is rejected:
error: invalid line 2: b
The reason is that the parser expects all short commands to have
an argument. Permit short commands without arguments.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index ee3961ec63..3107f59ea7 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1954,7 +1954,8 @@ static int parse_insn_line(struct todo_item *item, const char *bol, char *eol) if (skip_prefix(bol, todo_command_info[i].str, &bol)) { item->command = i; break; - } else if (bol[1] == ' ' && *bol == todo_command_info[i].c) { + } else if ((bol + 1 == eol || bol[1] == ' ') && + *bol == todo_command_info[i].c) { bol++; item->command = i; break; |