Merge branch 'maint'

diff --git a/fast-import.c b/fast-import.c
index e3290df3d4647fe97b5c9843299fc6f5b7155889..c4c8cb905e3bcdfb131af40da9f7e29ca86b4a01 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -673,7 +673,7 @@ static void fixup_header_footer(void)
 
        buf = xmalloc(buf_sz);
        for (;;) {
-               size_t n = xread(pack_fd, buf, buf_sz);
+               ssize_t n = xread(pack_fd, buf, buf_sz);
                if (!n)
                        break;
                if (n < 0)