merge-recursive: remove another implicit dependency on the_repository
Commit d7cf3a96e9a0 ("merge-recursive.c: remove implicit dependency on the_repository", 2019-01-12) and follow-ups like commit 34e7771bc644 ("Use the right 'struct repository' instead of the_repository", 2019-06-27), removed most implicit uses of the_repository. Convert calls to get_commit_tree() to instead use repo_get_commit_tree() to get rid of another. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2019 at 11:41 UTC
10f751c06bb3dbc2afed0e80ecfbd6242e12d538
1 file changed
+5
-2
merge-recursive.c
+5
-2
@@ -3587,8 +3587,11 @@ int merge_recursive(struct merge_options *opt,
3587
repo_read_index(opt->repo);
3588
3589
opt->ancestor = ancestor_name;
3590
- clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
3591
- get_commit_tree(merged_common_ancestors),
3590
+ clean = merge_trees(opt,
3591
+ repo_get_commit_tree(opt->repo, h1),
3592
+ repo_get_commit_tree(opt->repo, h2),
3593
+ repo_get_commit_tree(opt->repo,
3594
+ merged_common_ancestors),
3595
&mrtree);
3596
strbuf_release(&merge_base_abbrev);
3597
if (clean < 0) {