path: root/sequencer.h
diff options
authorJunio C Hamano <>2019-05-13 14:50:34 (GMT)
committerJunio C Hamano <>2019-05-13 14:50:34 (GMT)
commit7ba06bc3d026cee54437db5cfddfffe7b4d7a187 (patch)
treeeec56549e6d2e5593981ec2540b77f4a46e80309 /sequencer.h
parent6cfa633565cc16f77d6e6d56fa608680828105a1 (diff)
parent460bc3ce7386582b3259f8e3a2c1ace443ddb1ae (diff)
Merge branch 'pw/rebase-i-internal'
The internal implementation of "git rebase -i" has been updated to avoid forking a separate "rebase--interactive" process. * pw/rebase-i-internal: rebase -i: run without forking rebase--interactive rebase: use a common action enum rebase -i: use struct rebase_options in do_interactive_rebase() rebase -i: use struct rebase_options to parse args rebase -i: use struct object_id for squash_onto rebase -i: use struct commit when parsing options rebase -i: remove duplication rebase -i: combine rebase--interactive.c with rebase.c rebase: use OPT_RERERE_AUTOUPDATE() rebase: rename write_basic_state() rebase: don't translate trace strings sequencer: always discard index after checkout
Diffstat (limited to 'sequencer.h')
1 files changed, 4 insertions, 3 deletions
diff --git a/sequencer.h b/sequencer.h
index 75e292c..f4a8f4e 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -151,7 +151,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);
@@ -183,7 +183,8 @@ void commit_post_rewrite(struct repository *r,
const struct commit *current_head,
const struct object_id *new_head);
-int prepare_branch_to_be_rebased(struct replay_opts *opts, const char *commit);
+int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
+ const char *commit);
@@ -198,4 +199,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);