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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/merge-recursive.c b/merge-recursive.c
index 1d4df952e5359a7fce4c24d60df383be3dca6604..88a33e6e72f8f16b2bbb73e8feaa56de6d66378c 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3587,8 +3587,11 @@ int merge_recursive(struct merge_options *opt,
                repo_read_index(opt->repo);
 
        opt->ancestor = ancestor_name;
-       clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2),
-                           get_commit_tree(merged_common_ancestors),
+       clean = merge_trees(opt,
+                           repo_get_commit_tree(opt->repo, h1),
+                           repo_get_commit_tree(opt->repo, h2),
+                           repo_get_commit_tree(opt->repo,
+                                                merged_common_ancestors),
                            &mrtree);
        strbuf_release(&merge_base_abbrev);
        if (clean < 0) {