Make sure the empty tree exists when needed in merge-recursive.

diff --git a/merge-recursive.c b/merge-recursive.c
index cd2cc77bf47025a9dfc88f594961521c3ec8f22c..32e186c15e7dcdaff99f09a7edcf50a691c7ee74 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1238,7 +1238,7 @@ static int merge(struct commit *h1,
 
                tree->object.parsed = 1;
                tree->object.type = OBJ_TREE;
-               hash_sha1_file(NULL, 0, tree_type, tree->object.sha1);
+               write_sha1_file(NULL, 0, tree_type, tree->object.sha1);
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }