X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=3ac0289b3a3309fca9ade4e271dbd8b0d2f148ea;hb=8435a9cb2662ca4326e96ea78d58b9376fb21f7e;hp=43ed12484f6eb8bb828987872b2782182e579b9f;hpb=8e3abd4c97b8e7e1128ad0cc44dcc267f478659a;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 43ed12484..3ac0289b3 100644
--- 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;
@@ -417,7 +417,7 @@ static int same(struct cache_entry *a, struct cache_entry *b)
 	if (!a && !b)
 		return 1;
 	return a->ce_mode == b->ce_mode &&
-		!memcmp(a->sha1, b->sha1, 20);
+	       !hashcmp(a->sha1, b->sha1);
 }