Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 1bc1484645b4021ee71415f3b3ed44e4c88030d6..919112bba9271a8e3903b06946cf91036411f1a4 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -639,8 +639,7 @@ static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
                        /* deleted file */
                        result_size = 0;
                        elem->mode = 0;
-                       result = xmalloc(1);
-                       result[0] = 0;
+                       result = xcalloc(1, 1);
                }
                if (0 <= fd)
                        close(fd);