Merge branch 'nd/maint-work-tree-fix' into maint

diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index c370c7f834f69ba69d5366d47aadab3b6162b095..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");
@@ -321,10 +321,8 @@ static void unpack_all(void)
                die("unknown pack file version %d", ntohl(hdr->hdr_version));
        use(sizeof(struct pack_header));
 
-       if (!quiet) {
-               fprintf(stderr, "Unpacking %d objects\n", nr_objects);
-               start_progress(&progress, "", nr_objects);
-       }
+       if (!quiet)
+               start_progress(&progress, "Unpacking %u objects...", "", nr_objects);
        obj_list = xmalloc(nr_objects * sizeof(*obj_list));
        for (i = 0; i < nr_objects; i++) {
                unpack_one(i);