Merge branch 'master' into js/merge

diff --git a/merge-recursive.c b/merge-recursive.c
index 6e13b8ed5b7988f6379003242654a34b3ded6da6..9d53bcd5d626834f103ddcff2b59767579e69051 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1222,7 +1222,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");
        }