diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-27 21:58:30 -0800 |
| commit | fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a (patch) | |
| tree | 176d6a941baafd95b6a71e92f4ae2d077e5c6c95 /read-cache.c | |
| parent | 99f45c2a5db46c1397a80b0ab282456006b40cb1 (diff) | |
| parent | c879daa23729547fb28aa7e8783c5e4e619a9e7c (diff) | |
| download | git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.gz | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index b97b5668eb..98d526bd48 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 */ } |