Merge branch 'jc/hashmap-doc-init' into maint

diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index 4dad7095f10bb324f043ff8132678488b65d4537..d446b8eaca727dfa9c1b0928f2b8c9af286f2702 100644 (file)
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -3,24 +3,24 @@
 
 int main(int ac, char **av)
 {
-       unsigned char hash1[20], hash2[20], shifted[20];
+       struct object_id hash1, hash2, shifted;
        struct tree *one, *two;
 
        setup_git_directory();
 
-       if (get_sha1(av[1], hash1))
+       if (get_oid(av[1], &hash1))
                die("cannot parse %s as an object name", av[1]);
-       if (get_sha1(av[2], hash2))
+       if (get_oid(av[2], &hash2))
                die("cannot parse %s as an object name", av[2]);
-       one = parse_tree_indirect(hash1);
+       one = parse_tree_indirect(hash1.hash);
        if (!one)
                die("not a tree-ish %s", av[1]);
-       two = parse_tree_indirect(hash2);
+       two = parse_tree_indirect(hash2.hash);
        if (!two)
                die("not a tree-ish %s", av[2]);
 
-       shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
-       printf("shifted: %s\n", sha1_to_hex(shifted));
+       shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
+       printf("shifted: %s\n", oid_to_hex(&shifted));
 
        exit(0);
 }