Merge branch 'gp/branch'

diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 2bbda67fabfcc5292313c4ac6c462cd8911d9128..a6ff62fd8c66f075550e01718acf56d90b44d4bb 100644 (file)
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -34,7 +34,7 @@ static void *fill(int min)
                offset = 0;
        }
        do {
-               int ret = xread(0, buffer + len, sizeof(buffer) - len);
+               ssize_t ret = xread(0, buffer + len, sizeof(buffer) - len);
                if (ret <= 0) {
                        if (!ret)
                                die("early EOF");