Merge branch 'maint-1.6.0' into maint

diff --git a/sha1_file.c b/sha1_file.c
index 52d1ead15b4db62138d9cedd5fe04068bcd10461..ce5ea12c4462eef27ddeb587b4f9937a63178adf 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2337,7 +2337,8 @@ static int create_tmpfile(char *buffer, size_t bufsiz, const char *filename)
 static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
                              void *buf, unsigned long len, time_t mtime)
 {
-       int fd, size, ret;
+       int fd, ret;
+       size_t size;
        unsigned char *compressed;
        z_stream stream;
        char *filename;