Merge branch 'pw/checkout-conflict-errorfix'

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index 201f8f77755b439ad1b91b5b692c16aaeba5d032..eaede6cead9442995ef2f0ea2b449bceeaf0bcb7 100644 (file)
--- 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);
@@ -2024,7 +2025,7 @@ static int merge_3way(struct merge_options *opt,
                      mmbuffer_t *result_buf)
 {
        mmfile_t orig, src1, src2;
-       struct ll_merge_options ll_opts = {0};
+       struct ll_merge_options ll_opts = LL_MERGE_OPTIONS_INIT;
        char *base, *name1, *name2;
        enum ll_merge_result merge_status;
 
@@ -2034,6 +2035,7 @@ static int merge_3way(struct merge_options *opt,
        ll_opts.renormalize = opt->renormalize;
        ll_opts.extra_marker_size = extra_marker_size;
        ll_opts.xdl_opts = opt->xdl_opts;
+       ll_opts.conflict_style = opt->conflict_style;
 
        if (opt->priv->call_depth) {
                ll_opts.virtual_ancestor = 1;
@@ -4446,10 +4448,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);