diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
commit | c042c455d4ffb9b5ed0c280301b5661f3efad572 (patch) | |
tree | 11492f3ec3a0b024210d1daed8d0ed868408adf8 /sequencer.h | |
parent | ede4d63a2dbd4ed5477ce34872a808e99226230c (diff) | |
parent | 8843302307bb7d652f5adde759cd6a3c1a7fb1ea (diff) | |
download | git-c042c455d4ffb9b5ed0c280301b5661f3efad572.zip git-c042c455d4ffb9b5ed0c280301b5661f3efad572.tar.gz git-c042c455d4ffb9b5ed0c280301b5661f3efad572.tar.bz2 |
Merge branch 'pw/rebase-i-orig-head'
"git rebase -i" did not store ORIG_HEAD correctly.
* pw/rebase-i-orig-head:
rebase -i: simplify get_revision_ranges()
rebase -i: use struct object_id when writing state
rebase -i: use struct object_id rather than looking up commit
rebase -i: stop overwriting ORIG_HEAD buffer
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sequencer.h b/sequencer.h index f925e34..ce044ae 100644 --- a/sequencer.h +++ b/sequencer.h @@ -161,8 +161,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); /* @@ -224,7 +225,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); |