Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Makefile: help people who run 'make check' by mistake
[gitweb.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index e59d144d28164f2451784513105f6269f0e9167c..e5749ef638b4a9a490894d9d4fc5876d904ab9ac 100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-382,7
+382,7
@@
int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
o->merge_size = len;
if (!dfc)
- dfc = xcalloc(1,
sizeof(struct cache_entry) + 1
);
+ dfc = xcalloc(1,
cache_entry_size(0)
);
o->df_conflict_entry = dfc;
if (len) {