Merge branch 'jk/add-ignore-errors-bit-assignment-fix'

diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index d51e2ce1ec016ab35f1781675ff70793f0b974d5..3fae474f6f1f4fb78911ab4a26a160f04527d292 100644 (file)
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -78,10 +78,10 @@ static int count_cruft(const char *basename, const char *path, void *data)
        return 0;
 }
 
-static int print_alternate(struct alternate_object_database *alt, void *data)
+static int print_alternate(struct object_directory *odb, void *data)
 {
        printf("alternate: ");
-       quote_c_style(alt->path, NULL, stdout, 0);
+       quote_c_style(odb->path, NULL, stdout, 0);
        putchar('\n');
        return 0;
 }
@@ -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))