diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | 48be4c625bf0f35309fdf501f47eb7445a9f5494 (patch) | |
| tree | 57c025e707cefa3ae1afadf61dfb1df3d2cb11c4 | |
| parent | diff-lib: convert do_diff_cache to struct object_id (diff) | |
| download | tgif-48be4c625bf0f35309fdf501f47eb7445a9f5494.tar.xz | |
sequencer: convert do_recursive_merge to struct object_id
This conversion is required to convert parse_tree_indirect.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index dcc56a2b69..adcc0a953f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -426,7 +426,7 @@ void append_conflicts_hint(struct strbuf *msgbuf) static int do_recursive_merge(struct commit *base, struct commit *next, const char *base_label, const char *next_label, - unsigned char *head, struct strbuf *msgbuf, + struct object_id *head, struct strbuf *msgbuf, struct replay_opts *opts) { struct merge_options o; @@ -446,7 +446,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, if (is_rebase_i(opts)) o.buffer_output = 2; - head_tree = parse_tree_indirect(head); + head_tree = parse_tree_indirect(head->hash); next_tree = next ? next->tree : empty_tree(); base_tree = base ? base->tree : empty_tree(); @@ -1081,7 +1081,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, res = -1; else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) { res = do_recursive_merge(base, next, base_label, next_label, - head.hash, &msgbuf, opts); + &head, &msgbuf, opts); if (res < 0) return res; res |= write_message(msgbuf.buf, msgbuf.len, |