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>
This commit is contained in:
parent
e929f515fa
commit
14576df044
@ -2324,7 +2324,7 @@ static void file_change_m(const char *p, struct branch *b)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Git does not track empty, non-toplevel directories. */
|
/* 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);
|
tree_content_remove(&b->branch_tree, p, NULL, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user