Merge branch 'mg/count-objects'

* mg/count-objects:
count-objects: Add total pack size to verbose output

diff --combined builtin-count-objects.c
index a1c9eb41cbad932f0438c0c68ca5c3764c78a65c,249040b96a44d4e2ca591c7bfd9742afc251cf21..6e80fe7c016788c178e206c61f5ef3c1fdea506c
--- 1/builtin-count-objects.c
--- 2/builtin-count-objects.c
+++ b/builtin-count-objects.c
@@@ -43,7 -43,7 +43,7 @@@ static void count_objects(DIR *d, char 
                        if (lstat(path, &st) || !S_ISREG(st.st_mode))
                                bad = 1;
                        else
 -                              (*loose_size) += xsize_t(st.st_blocks);
 +                              (*loose_size) += xsize_t(on_disk_bytes(st));
                }
                if (bad) {
                        if (verbose) {
@@@ -104,6 -104,7 +104,7 @@@ int cmd_count_objects(int argc, const c
        if (verbose) {
                struct packed_git *p;
                unsigned long num_pack = 0;
+               unsigned long size_pack = 0;
                if (!packed_git)
                        prepare_packed_git();
                for (p = packed_git; p; p = p->next) {
@@@ -112,12 -113,14 +113,14 @@@
                        if (open_pack_index(p))
                                continue;
                        packed += p->num_objects;
+                       size_pack += p->pack_size + p->index_size;
                        num_pack++;
                }
                printf("count: %lu\n", loose);
 -              printf("size: %lu\n", loose_size / 2);
 +              printf("size: %lu\n", loose_size / 1024);
                printf("in-pack: %lu\n", packed);
                printf("packs: %lu\n", num_pack);
+               printf("size-pack: %lu\n", size_pack / 1024);
                printf("prune-packable: %lu\n", packed_loose);
                printf("garbage: %lu\n", garbage);
        }