path: root/sequencer.h
diff options
authorAlban Gruin <>2020-01-28 21:12:45 (GMT)
committerJunio C Hamano <>2020-01-28 22:13:41 (GMT)
commit1da5874c1b283862f8252a2f5f2f8d4afe86346a (patch)
treef90ec8e3e57d103a9b94f16dc3eb80c9339625a0 /sequencer.h
parent26027625dd1ee358e2174a09d519252995d51662 (diff)
sequencer: move check_todo_list_from_file() to rebase-interactive.c
The message contained in `edit_todo_list_advice' (sequencer.c) is printed after the initial edit of the todo list if it can't be parsed or if commits were dropped. This is done either in complete_action() for `rebase -i', or in check_todo_list_from_file() for `rebase -p'. Since we want to add this check when editing the list, we also want to use this message from edit_todo_list() (rebase-interactive.c). To this end, check_todo_list_from_file() is moved to rebase-interactive.c, and `edit_todo_list_advice' is copied there. In the next commit, complete_action() will stop using it, and `edit_todo_list_advice' will be removed from sequencer.c. Signed-off-by: Alban Gruin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'sequencer.h')
1 files changed, 0 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h
index 9f9ae29..5d4df08 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -155,7 +155,6 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
void todo_list_add_exec_commands(struct todo_list *todo_list,
struct string_list *commands);
-int check_todo_list_from_file(struct repository *r);
int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
const char *shortrevisions, const char *onto_name,
struct commit *onto, const char *orig_head, struct string_list *commands,