summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:30 (GMT)
commitfc7ae9c156775cc9679c0bcc7156abb7dba1bd3a (patch)
tree176d6a941baafd95b6a71e92f4ae2d077e5c6c95 /read-cache.c
parent99f45c2a5db46c1397a80b0ab282456006b40cb1 (diff)
parentc879daa23729547fb28aa7e8783c5e4e619a9e7c (diff)
downloadgit-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.zip
git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.gz
git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.bz2
Merge branch 'nd/hash-object-sanity'
* nd/hash-object-sanity: Make hash-object more robust against malformed objects Conflicts: cache.h
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c
index b97b566..98d526b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -92,7 +92,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
if (fd >= 0) {
unsigned char sha1[20];
- if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name))
+ if (!index_fd(sha1, fd, st, 0, OBJ_BLOB, ce->name, 0))
match = hashcmp(sha1, ce->sha1);
/* index_fd() closed the file descriptor already */
}