Account for tree entry memory costs in fast-import.

[git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 467d9940f5a2e9cd8a880e4c8f0f1d2a8a5f7aa1..3ac0289b3a3309fca9ade4e271dbd8b0d2f148ea 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -200,7 +200,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
 
                        any_files = 1;
 
-                       memcpy(ce->sha1, posns[i]->sha1, 20);
+                       hashcpy(ce->sha1, posns[i]->sha1);
                        src[i + o->merge] = ce;
                        subposns[i] = df_conflict_list;
                        posns[i] = posns[i]->next;