diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-08 23:31:27 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-08 23:31:51 -0700 |
commit | 7ec1eb93f779d06efac106cd1998410932f3c9b2 (patch) | |
tree | 5c6ca3d326b0ccb8cc09064306bb3a591d7b3349 /cache.h | |
parent | Merge branch 'maint' (diff) | |
parent | diff.c: work around pointer constness warnings (diff) | |
download | tgif-7ec1eb93f779d06efac106cd1998410932f3c9b2.tar.xz |
Merge early parts of jk/cached-textconv
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -701,7 +701,7 @@ static inline void *read_sha1_file(const unsigned char *sha1, enum object_type * return read_sha1_file_repl(sha1, type, size, NULL); } extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); -extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); +extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1); 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); |