fast-import: use hashcmp() for SHA1 hash comparison

rscharfe · gitster · commit 14576df044be · 2014-07-18T12:14:47.000-07:00
Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/fast-import.c b/fast-import.c
@@ -2324,7 +2324,7 @@ static void file_change_m(const char *p, struct branch *b)
 	}
 
 	/* Git does not track empty, non-toplevel directories. */
-	if (S_ISDIR(mode) && !memcmp(sha1, EMPTY_TREE_SHA1_BIN, 20) && *p) {
+	if (S_ISDIR(mode) && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN) && *p) {
 		tree_content_remove(&b->branch_tree, p, NULL, 0);
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2324,7 +2324,7 @@ static void file_change_m(const char p, struct branch b)`
`2324`	`2324`	`}`
`2325`	`2325`
`2326`	`2326`	`/* Git does not track empty, non-toplevel directories. */`
`2327`		`- if (S_ISDIR(mode) && !memcmp(sha1, EMPTY_TREE_SHA1_BIN, 20) && *p) {`
	`2327`	`+ if (S_ISDIR(mode) && !hashcmp(sha1, EMPTY_TREE_SHA1_BIN) && *p) {`
`2328`	`2328`	`tree_content_remove(&b->branch_tree, p, NULL, 0);`
`2329`	`2329`	`return;`
`2330`	`2330`	`}`