X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=unpack-trees.c;h=3ac0289b3a3309fca9ade4e271dbd8b0d2f148ea;hb=91c23e48d0666a673dd14760bb00f6d59234d9d9;hp=a20639be70edb13bc87353a69a13f17994ea41a5;hpb=eb4541569d4fdfb1cbdf503cfbf433e63d79b663;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index a20639be7..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;
@@ -278,7 +278,7 @@ static void unlink_entry(char *name)
 	}
 }
 
-static volatile int progress_update = 0;
+static volatile sig_atomic_t progress_update;
 
 static void progress_interval(int signum)
 {
@@ -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);
 }