diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-04 08:25:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-04 08:25:52 -0700 |
| commit | e7dca80692dec7f0717d9ad6d978d0ceab90cf6a (patch) | |
| tree | 3fd355c15df79b7e89ba63c906b6b5b34100513e /t/helper/test-match-trees.c | |
| parent | ec2f02696157d3781fbfd410f0017c49cc1eda01 (diff) | |
| parent | 4a93b899c19794c28b140bf78a13fb9c2b34f433 (diff) | |
| download | git-e7dca80692dec7f0717d9ad6d978d0ceab90cf6a.tar.gz | |
Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
* ab/remove-implicit-use-of-the-repository:
libs: use "struct repository *" argument, not "the_repository"
post-cocci: adjust comments for recent repo_* migration
cocci: apply the "revision.h" part of "the_repository.pending"
cocci: apply the "rerere.h" part of "the_repository.pending"
cocci: apply the "refs.h" part of "the_repository.pending"
cocci: apply the "promisor-remote.h" part of "the_repository.pending"
cocci: apply the "packfile.h" part of "the_repository.pending"
cocci: apply the "pretty.h" part of "the_repository.pending"
cocci: apply the "object-store.h" part of "the_repository.pending"
cocci: apply the "diff.h" part of "the_repository.pending"
cocci: apply the "commit.h" part of "the_repository.pending"
cocci: apply the "commit-reach.h" part of "the_repository.pending"
cocci: apply the "cache.h" part of "the_repository.pending"
cocci: add missing "the_repository" macros to "pending"
cocci: sort "the_repository" rules by header
cocci: fix incorrect & verbose "the_repository" rules
cocci: remove dead rule from "the_repository.pending.cocci"
Diffstat (limited to 't/helper/test-match-trees.c')
| -rw-r--r-- | t/helper/test-match-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c index 64705734df..7066f3c71d 100644 --- a/t/helper/test-match-trees.c +++ b/t/helper/test-match-trees.c @@ -11,9 +11,9 @@ int cmd__match_trees(int ac, const char **av) setup_git_directory(); - if (get_oid(av[1], &hash1)) + if (repo_get_oid(the_repository, av[1], &hash1)) die("cannot parse %s as an object name", av[1]); - if (get_oid(av[2], &hash2)) + if (repo_get_oid(the_repository, av[2], &hash2)) die("cannot parse %s as an object name", av[2]); one = parse_tree_indirect(&hash1); if (!one) |