X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=2ba43ae84b20f993ba175f728297cf5360066872;hb=173a9cbe7031bc3574b3f41cb2d2375cf959ff2a;hp=611cd95cf597b0ccf06cf9b4318eb34a86a4c05a;hpb=7f0f4fa4374edfe2050b3ab636f43ee80daa63f2;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index 611cd95cf..2ba43ae84 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1235,13 +1235,10 @@ int merge(struct commit *h1,
 	if (merged_common_ancestors == NULL) {
 		/* if there is no common ancestor, make an empty tree */
 		struct tree *tree = xcalloc(1, sizeof(struct tree));
-		unsigned char hdr[40];
-		int hdrlen;
 
 		tree->object.parsed = 1;
 		tree->object.type = OBJ_TREE;
-		write_sha1_file_prepare(NULL, 0, tree_type, tree->object.sha1,
-					hdr, &hdrlen);
+		hash_sha1_file(NULL, 0, tree_type, tree->object.sha1);
 		merged_common_ancestors = make_virtual_commit(tree, "ancestor");
 	}