path.c: refactor and add worktree_git_path()

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