diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-17 15:30:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-19 17:32:10 +0900 |
| commit | 7d3488eb893ba53186770181171ee8ebc8100e18 (patch) | |
| tree | f08740a8f4a0914100376aafa146816577768079 /sequencer.h | |
| parent | c44c24621da1cf45e2525b42d90982c78bffc207 (diff) | |
| download | git-7d3488eb893ba53186770181171ee8ebc8100e18.tar.gz | |
rebase -i: use struct commit when parsing options
This is in preparation for using `struct rebase_options` when parsing
options in cmd_rebase__interactive(). Using a string for onto,
restrict_revision and upstream, was a hangover from the scripted version
of rebase. The functions that use these variables are updated to take a
`struct commit`.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sequencer.h b/sequencer.h index 6c55aa4200..e640ca21f2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -150,7 +150,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, 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, - const char *onto, const char *orig_head, struct string_list *commands, + struct commit *onto, const char *orig_head, struct string_list *commands, unsigned autosquash, struct todo_list *todo_list); int todo_list_rearrange_squash(struct todo_list *todo_list); @@ -191,4 +191,4 @@ int read_author_script(const char *path, char **name, char **email, char **date, void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, - const char *onto, const char *orig_head); + struct commit *onto, const char *orig_head); |