From: René Scharfe <l.s.r@web.de>
Date: Fri, 18 Jul 2014 16:00:51 +0000 (+0200)
Subject: fast-import: use hashcmp() for SHA1 hash comparison
X-Git-Tag: v2.1.0-rc0~10^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14576df044be25b00d43aa24057d3abe4b9fd6f5;p=git

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

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/fast-import.c b/fast-import.c
index fa635f75c3..d73f58cbe3 100644
--- 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;
 	}