Skip to content

Commit 0548510

Browse files
committed
sequencer (rebase -i): suggest --edit-todo upon unknown command
This is the same behavior as known from `git rebase -i`. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 8fbacef commit 0548510

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

sequencer.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1343,8 +1343,12 @@ static int read_populate_todo(struct todo_list *todo_list,
13431343
close(fd);
13441344

13451345
res = parse_insn_buffer(todo_list->buf.buf, todo_list);
1346-
if (res)
1346+
if (res) {
1347+
if (is_rebase_i(opts))
1348+
return error("Please fix this using "
1349+
"'git rebase --edit-todo'.");
13471350
return error(_("Unusable instruction sheet: %s"), todo_file);
1351+
}
13481352

13491353
if (!todo_list->nr &&
13501354
(!is_rebase_i(opts) || !file_exists(rebase_path_done())))

0 commit comments

Comments
 (0)