Merge branch 'ma/asciidoctor-fixes-more'

diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 4e2fdb5e30d1ae30b1f75b7e3ca636afa4c0e097..63c689d6ee9d018efd32aa228ee3cf784fa5b71d 100644 (file)
--- a/t/helper/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
@@ -14,13 +14,13 @@ int cmd__dump_split_index(int ac, const char **av)
        int i;
 
        do_read_index(&the_index, av[1], 1);
-       printf("own %s\n", sha1_to_hex(the_index.sha1));
+       printf("own %s\n", oid_to_hex(&the_index.oid));
        si = the_index.split_index;
        if (!si) {
                printf("not a split index\n");
                return 0;
        }
-       printf("base %s\n", sha1_to_hex(si->base_sha1));
+       printf("base %s\n", oid_to_hex(&si->base_oid));
        for (i = 0; i < the_index.cache_nr; i++) {
                struct cache_entry *ce = the_index.cache[i];
                printf("%06o %s %d\t%s\n", ce->ce_mode,