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 /cache.h | |
| 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 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -516,7 +516,7 @@ struct pathspec { extern int init_pathspec(struct pathspec *, const char **); extern void free_pathspec(struct pathspec *); extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec); -extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path); +extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path, int format_check); extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); |