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 /builtin | |
| parent | 99f45c2a5db46c1397a80b0ab282456006b40cb1 (diff) | |
| parent | c879daa23729547fb28aa7e8783c5e4e619a9e7c (diff) | |
| download | git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.gz git-fc7ae9c156775cc9679c0bcc7156abb7dba1bd3a.tar.xz | |
Merge branch 'nd/hash-object-sanity'
* nd/hash-object-sanity:
Make hash-object more robust against malformed objects
Conflicts:
cache.h
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/hash-object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 080af1a01..c90acddcb 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -15,7 +15,7 @@ static void hash_fd(int fd, const char *type, int write_object, const char *path struct stat st; unsigned char sha1[20]; if (fstat(fd, &st) < 0 || - index_fd(sha1, fd, &st, write_object, type_from_string(type), path)) + index_fd(sha1, fd, &st, write_object, type_from_string(type), path, 1)) die(write_object ? "Unable to add %s to database" : "Unable to hash %s", path); |