Start the 2.46 cycle

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

diff --git a/merge-recursive.c b/merge-recursive.c
index 103ee321aeb8cd8c169d35316bb20cfd9eea1693..8ff29ed09efb3303adf82d39c5fb54a0d11fc897 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -407,7 +407,7 @@ static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
 {
        if (parse_tree(tree) < 0)
                exit(128);
-       init_tree_desc(desc, tree->buffer, tree->size);
+       init_tree_desc(desc, &tree->object.oid, tree->buffer, tree->size);
 }
 
 static int unpack_trees_start(struct merge_options *opt,
@@ -1048,13 +1048,14 @@ static int merge_3way(struct merge_options *opt,
                      const int extra_marker_size)
 {
        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;
 
        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;
@@ -3947,6 +3948,8 @@ void init_merge_options(struct merge_options *opt,
 
        opt->renormalize = 0;
 
+       opt->conflict_style = -1;
+
        merge_recursive_config(opt);
        merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
        if (merge_verbosity)