From a930eb03a8299b5b29284dd9e3c253c38187167a Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 5 Mar 2019 20:18:03 +0100 Subject: rebase-interactive: rewrite edit_todo_list() to handle the initial edit edit_todo_list() is changed to work on a todo_list, and to handle the initial edition of the todo list (ie. making a backup of the todo list). It does not check for dropped commits yet, as todo_list_check() does not take the commits that have already been processed by the rebase (ie. the todo list is edited in the middle of a rebase session). Signed-off-by: Alban Gruin Signed-off-by: Junio C Hamano --- rebase-interactive.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'rebase-interactive.h') diff --git a/rebase-interactive.h b/rebase-interactive.h index 0e5925e3aa..44dbb06311 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -8,7 +8,9 @@ struct todo_list; void append_todo_help(unsigned keep_empty, int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf); -int edit_todo_list(struct repository *r, unsigned flags); +int edit_todo_list(struct repository *r, struct todo_list *todo_list, + struct todo_list *new_todo, const char *shortrevisions, + const char *shortonto, unsigned flags); int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); #endif -- cgit v1.2.3