global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-31 13:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): the todo can be empty when continuing

Browse Source 
When the last command of an interactive rebase fails, the user needs to
resolve the problem and then continue the interactive rebase. Naturally,
the todo script is empty by then. So let's not complain about that!

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-04-13 14:11:54 +02:00
parent 3a1417a67b
commit 1ed867cdbc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sequencer.c
View File

@@ -1249,8 +1249,6 @@ static int parse_insn_buffer(char *buf, struct todo_list *todo_list)
fixup_okay = 1;
p = *eol ? eol + 1 : eol;
}
if (!todo_list->nr)
return error(_("No commits parsed."));
return res;
}
@@ -1273,6 +1271,9 @@ static int read_populate_todo(struct todo_list *todo_list,
res = parse_insn_buffer(todo_list->buf.buf, todo_list);
if (res)
return error(_("Unusable instruction sheet: %s"), todo_file);
if (!todo_list->nr &&
(!is_rebase_i(opts) || !file_exists(rebase_path_done())))
return error(_("No commits parsed."));
return 0;
}