diff options
| author | Alban Gruin <alban.gruin@gmail.com> | 2019-03-05 20:18:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:17:57 +0100 |
| commit | a930eb03a8299b5b29284dd9e3c253c38187167a (patch) | |
| tree | 701fad4abf3ec0445d84a33158c85bf61d0d3ea0 /rebase-interactive.h | |
| parent | rebase-interactive: append_todo_help() changes (diff) | |
| download | git-a930eb03a8299b5b29284dd9e3c253c38187167a.tar.xz git-a930eb03a8299b5b29284dd9e3c253c38187167a.zip | |
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 <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.h')
| -rw-r--r-- | rebase-interactive.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |