mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 02:17:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): suggest --edit-todo upon unknown command

Browse Source 
This is the same behavior as known from `git rebase -i`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-01-02 16:35:42 +01:00 committed by Junio C Hamano
parent 62fdb6529a
commit 27fdbb96aa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sequencer.c
View File

@ -1314,8 +1314,12 @@ static int read_populate_todo(struct todo_list *todo_list,
close(fd);
res = parse_insn_buffer(todo_list->buf.buf, todo_list);
if (res)
if (res) {
if (is_rebase_i(opts))
return error(_("please fix this using "
"'git rebase --edit-todo'."));
return error(_("unusable instruction sheet: '%s'"), todo_file);
}
if (!todo_list->nr &&
(!is_rebase_i(opts) || !file_exists(rebase_path_done())))