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>
brian m. carlson committed
May 6, 2017 at 22:10 UTC
48be4c625bf0f35309fdf501f47eb7445a9f5494
1 file changed
+3
-3
sequencer.c
+3
-3
@@ -426,7 +426,7 @@ void append_conflicts_hint(struct strbuf *msgbuf)
426
427
static int do_recursive_merge(struct commit *base, struct commit *next,
428
const char *base_label, const char *next_label,
429
- unsigned char *head, struct strbuf *msgbuf,
429
+ struct object_id *head, struct strbuf *msgbuf,
430
struct replay_opts *opts)
431
{
432
struct merge_options o;
@@ -446,7 +446,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
446
if (is_rebase_i(opts))
447
o.buffer_output = 2;
448
449
- head_tree = parse_tree_indirect(head);
449
+ head_tree = parse_tree_indirect(head->hash);
450
next_tree = next ? next->tree : empty_tree();
451
base_tree = base ? base->tree : empty_tree();
452
@@ -1081,7 +1081,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
1081
res = -1;
1082
else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
1083
res = do_recursive_merge(base, next, base_label, next_label,
1084
- head.hash, &msgbuf, opts);
1084
+ &head, &msgbuf, opts);
1085
if (res < 0)
1086
return res;
1087
res |= write_message(msgbuf.buf, msgbuf.len,