Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
fast-import: use hashcmp() for SHA1 hash comparison
author
René Scharfe
<l.s.r@web.de>
Fri, 18 Jul 2014 16:00:51 +0000
(18:00 +0200)
committer
Junio 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
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
e929f51
)
diff --git
a/fast-import.c
b/fast-import.c
index fa635f75c328354f7a4b44ca1e22461b1eb16de1..d73f58cbe3fe4522fa24d47f9086d927b3296c8b 100644
(file)
--- 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;
}