Merge branch 'nd/unpack-trees-with-cache-tree'

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 76a60d78828307b20040ebeedb97fb4b642f2c81..831b586d022215ff75b4e426d79e7149b3bfb3bb 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -7,7 +7,7 @@
 static int read_midx_file(const char *object_dir)
 {
        uint32_t i;
-       struct multi_pack_index *m = load_multi_pack_index(object_dir);
+       struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
 
        if (!m)
                return 1;
@@ -22,8 +22,16 @@ static int read_midx_file(const char *object_dir)
 
        if (m->chunk_pack_names)
                printf(" pack-names");
-
-       printf("\n");
+       if (m->chunk_oid_fanout)
+               printf(" oid-fanout");
+       if (m->chunk_oid_lookup)
+               printf(" oid-lookup");
+       if (m->chunk_object_offsets)
+               printf(" object-offsets");
+       if (m->chunk_large_offsets)
+               printf(" large-offsets");
+
+       printf("\nnum_objects: %d\n", m->num_objects);
 
        printf("packs:\n");
        for (i = 0; i < m->num_packs; i++)