Merge branch 'jk/config-lockfile-leak-fix' into maint

diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index e9395028630bf26390366065aa07bc7b2827eb73..356d8edef1d25524abaae0f0fcb3bf072d229c30 100644 (file)
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -12,10 +12,10 @@ int cmd_main(int ac, const char **av)
                die("cannot parse %s as an object name", av[1]);
        if (get_oid(av[2], &hash2))
                die("cannot parse %s as an object name", av[2]);
-       one = parse_tree_indirect(hash1.hash);
+       one = parse_tree_indirect(&hash1);
        if (!one)
                die("not a tree-ish %s", av[1]);
-       two = parse_tree_indirect(hash2.hash);
+       two = parse_tree_indirect(&hash2);
        if (!two)
                die("not a tree-ish %s", av[2]);