]> granicus.if.org Git - git/commitdiff
fast-import: use hashcmp() for SHA1 hash comparison
authorRené Scharfe <l.s.r@web.de>
Fri, 18 Jul 2014 16:00:51 +0000 (18:00 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jul 2014 19:14:47 +0000 (12:14 -0700)
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fast-import.c

index fa635f75c328354f7a4b44ca1e22461b1eb16de1..d73f58cbe3fe4522fa24d47f9086d927b3296c8b 100644 (file)
@@ -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;
        }