Merge branch 'ds/multi-pack-index'

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index d51e2ce1ec016ab35f1781675ff70793f0b974d5..a7cad052c615807b819f32c999c161f0f905c1bc 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -123,7 +123,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix)
                struct strbuf pack_buf = STRBUF_INIT;
                struct strbuf garbage_buf = STRBUF_INIT;
 
-               for (p = get_packed_git(the_repository); p; p = p->next) {
+               for (p = get_all_packs(the_repository); p; p = p->next) {
                        if (!p->pack_local)
                                continue;
                        if (open_pack_index(p))