Merge branch 'en/rename-directory-detection-reboot'

diff --git a/merge-recursive.c b/merge-recursive.c
index 13b47629719022c0e5d1311a1c7c3cd905936700..35df695fa420073d04997a3792f1c3a45d278b5d 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -162,7 +162,7 @@ static struct commit *make_virtual_commit(struct tree *tree, const char *comment
        struct commit *commit = alloc_commit_node();
 
        set_merge_remote_desc(commit, comment, (struct object *)commit);
-       commit->tree = tree;
+       commit->maybe_tree = tree;
        commit->object.parsed = 1;
        return commit;
 }
@@ -3246,7 +3246,8 @@ int merge_recursive(struct merge_options *o,
                read_cache();
 
        o->ancestor = "merged common ancestors";
-       clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
+       clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2),
+                           get_commit_tree(merged_common_ancestors),
                            &mrtree);
        if (clean < 0) {
                flush_output(o);