diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
| commit | 1eb0a12ec3934b7fc398b118806fdf7550ae636e (patch) | |
| tree | 7ffd8929d36f31040b31a92f45548154986e8fdf /t/helper | |
| parent | Merge branch 'ra/cherry-pick-revert-skip' (diff) | |
| parent | t7814: do not generate same commits in different repos (diff) | |
| download | tgif-1eb0a12ec3934b7fc398b118806fdf7550ae636e.tar.xz | |
Merge branch 'nd/tree-walk-with-repo'
The tree-walk API learned to pass an in-core repository
instance throughout more codepaths.
* nd/tree-walk-with-repo:
t7814: do not generate same commits in different repos
Use the right 'struct repository' instead of the_repository
match-trees.c: remove the_repo from shift_tree*()
tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
tree-walk.c: remove the_repo from get_tree_entry()
tree-walk.c: remove the_repo from fill_tree_descriptor()
sha1-file.c: remove the_repo from read_object_with_reference()
Diffstat (limited to 't/helper')
| -rw-r--r-- | t/helper/test-match-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c index 96857f26ac..b9fd427571 100644 --- a/t/helper/test-match-trees.c +++ b/t/helper/test-match-trees.c @@ -20,7 +20,7 @@ int cmd__match_trees(int ac, const char **av) if (!two) die("not a tree-ish %s", av[2]); - shift_tree(&one->object.oid, &two->object.oid, &shifted, -1); + shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1); printf("shifted: %s\n", oid_to_hex(&shifted)); exit(0); |