diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:23:59 -0700 |
| commit | 051086b947ee7a6fdd5697889a225098f723761d (patch) | |
| tree | 0920d85e5e97dad89618cf87307a3f4d0bf5abbe /cache.h | |
| parent | b9f5d3874f3406c820049b26fd7b10f7cae7138f (diff) | |
| parent | 1427a7ff70bce0c1040831d5d674c83ebcda6d7d (diff) | |
| download | git-051086b947ee7a6fdd5697889a225098f723761d.tar.gz | |
Merge branch 'jc/hash-object'
"hash-object --literally" introduced in v2.2 was not prepared to
take a really long object type name.
* jc/hash-object:
write_sha1_file(): do not use a separate sha1[] array
t1007: add hash-object --literally tests
hash-object --literally: fix buffer overrun with extra-long object type
git-hash-object.txt: document --literally option
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -909,6 +909,7 @@ static inline const unsigned char *lookup_replace_object_extended(const unsigned extern int sha1_object_info(const unsigned char *, unsigned long *); extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1); +extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern int git_open_noatime(const char *name); |