X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-tree.c;h=2d1413efbbc33c51fd4820933dcb54164e12d706;hb=0693f9ddad3d9af3d3424087557bbddce480ce3f;hp=02fc10f7e622ba1c53065e7cf4563ff10af0c41f;hpb=77599cc0bbd0a08defc3bfa80ca52d931d8dc786;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 02fc10f7e..2d1413efb 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -158,9 +158,8 @@ static int same_entry(struct name_entry *a, struct name_entry *b)
 
 static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
 {
-	struct merge_list *res = xmalloc(sizeof(*res));
+	struct merge_list *res = xcalloc(1, sizeof(*res));
 
-	memset(res, 0, sizeof(*res));
 	res->stage = stage;
 	res->path = path;
 	res->mode = mode;