diff options
Diffstat (limited to 'merge-ort.c')
-rw-r--r-- | merge-ort.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/merge-ort.c b/merge-ort.c index 201f8f7775..ac225cc33c 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1665,9 +1665,10 @@ static int collect_merge_info(struct merge_options *opt, parse_tree(side1) < 0 || parse_tree(side2) < 0) return -1; - init_tree_desc(t + 0, merge_base->buffer, merge_base->size); - init_tree_desc(t + 1, side1->buffer, side1->size); - init_tree_desc(t + 2, side2->buffer, side2->size); + init_tree_desc(t + 0, &merge_base->object.oid, + merge_base->buffer, merge_base->size); + init_tree_desc(t + 1, &side1->object.oid, side1->buffer, side1->size); + init_tree_desc(t + 2, &side2->object.oid, side2->buffer, side2->size); trace2_region_enter("merge", "traverse_trees", opt->repo); ret = traverse_trees(NULL, 3, t, &info); @@ -4446,10 +4447,10 @@ static int checkout(struct merge_options *opt, unpack_opts.preserve_ignored = 0; /* FIXME: !opts->overwrite_ignore */ if (parse_tree(prev) < 0) return -1; - init_tree_desc(&trees[0], prev->buffer, prev->size); + init_tree_desc(&trees[0], &prev->object.oid, prev->buffer, prev->size); if (parse_tree(next) < 0) return -1; - init_tree_desc(&trees[1], next->buffer, next->size); + init_tree_desc(&trees[1], &next->object.oid, next->buffer, next->size); ret = unpack_trees(2, trees, &unpack_opts); clear_unpack_trees_porcelain(&unpack_opts); |