diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sequencer.h b/sequencer.h index b2a501e445..f8b2e4ab85 100644 --- a/sequencer.h +++ b/sequencer.h @@ -50,13 +50,12 @@ struct replay_opts { int mainline; - char *committer_name; - char *committer_email; char *gpg_sign; enum commit_msg_cleanup_mode default_msg_cleanup; int explicit_cleanup; /* Merge strategy */ + char *default_strategy; /* from config options */ char *strategy; char **xopts; size_t xopts_nr, xopts_alloc; @@ -163,8 +162,9 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands); 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, - unsigned autosquash, struct todo_list *todo_list); + struct commit *onto, const struct object_id *orig_head, + struct string_list *commands, unsigned autosquash, + struct todo_list *todo_list); int todo_list_rearrange_squash(struct todo_list *todo_list); /* @@ -226,7 +226,7 @@ int read_author_script(const char *path, char **name, char **email, char **date, int allow_missing); void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, - struct commit *onto, const char *orig_head); + struct commit *onto, const struct object_id *orig_head); void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); |