diff --git a/unpack-trees.c b/unpack-trees.c
index 43ed12484f6eb8bb828987872b2782182e579b9f..3ac0289b3a3309fca9ade4e271dbd8b0d2f148ea 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
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;
if (!a && !b)
return 1;
return a->ce_mode == b->ce_mode &&
- !memcmp(a->sha1, b->sha1, 20);
+ !hashcmp(a->sha1, b->sha1);
}