diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2024-05-30 13:43:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-30 10:02:56 -0700 |
| commit | 0c26738aa4a8256b40a46476c2433c03a562124f (patch) | |
| tree | e1b2acc94ea099cda89ace6aa67e27145a34e7e5 /rebase-interactive.h | |
| parent | 19981daefd7c147444462739375462b49412ce33 (diff) | |
| download | git-0c26738aa4a8256b40a46476c2433c03a562124f.tar.gz | |
rebase -i: pass struct replay_opts to parse_insn_line()
This new parameter will be used in the next commit. As adding the
parameter requires quite a few changes to plumb it through the call
chain these are separated into their own commit to avoid cluttering up
the next commit with incidental changes.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rebase-interactive.h')
| -rw-r--r-- | rebase-interactive.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rebase-interactive.h b/rebase-interactive.h index 7239c60f79..8e5b181b33 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -3,17 +3,20 @@ struct strbuf; struct repository; +struct replay_opts; struct todo_list; void append_todo_help(int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf); -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 edit_todo_list(struct repository *r, struct replay_opts *opts, + 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); int todo_list_check_against_backup(struct repository *r, + struct replay_opts *opts, struct todo_list *todo_list); #endif |