diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-10 07:10:18 (GMT) |
commit | f69714c38c6f3296a4bfba0d057e0f1605373f49 (patch) | |
tree | 2d850f14f62d33ed514e2b197b63fe459ff20d37 /sha1_file.c | |
parent | edee414c3e5a546aae3dd1529f397df949713305 (diff) | |
parent | c35a7b8d806317dc1762e36561cbd31c2530dd9c (diff) | |
download | git-f69714c38c6f3296a4bfba0d057e0f1605373f49.zip git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.gz git-f69714c38c6f3296a4bfba0d057e0f1605373f49.tar.bz2 |
Merge with master.
This merges commit
c35a7b8d806317dc1762e36561cbd31c2530dd9c
from master into our head commit
edee414c3e5a546aae3dd1529f397df949713305
Sincerely,
jit-merge command.
Diffstat (limited to 'sha1_file.c')
-rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index e9285c1..8d189d4 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1388,7 +1388,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer, ssize_t size; if (*bufposn) { stream.avail_in = *bufposn; - stream.next_in = buffer; + stream.next_in = (unsigned char *) buffer; do { stream.next_out = discard; stream.avail_out = sizeof(discard); |