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 988a48716986c6b73361accdefefdd8e0164b5ce..831b586d022215ff75b4e426d79e7149b3bfb3bb 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -6,7 +6,8 @@
 
 static int read_midx_file(const char *object_dir)
 {
-       struct multi_pack_index *m = load_multi_pack_index(object_dir);
+       uint32_t i;
+       struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
 
        if (!m)
                return 1;
@@ -17,6 +18,25 @@ static int read_midx_file(const char *object_dir)
               m->num_chunks,
               m->num_packs);
 
+       printf("chunks:");
+
+       if (m->chunk_pack_names)
+               printf(" pack-names");
+       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++)
+               printf("%s\n", m->pack_names[i]);
+
        printf("object-dir: %s\n", m->object_dir);
 
        return 0;