Elijah Newren <new...@gmail.com> writes:
> 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.
You are getting rid of three more!!!
Nice ;-)
> Signed-off-by: Elijah Newren <new...@gmail.com>
> ---
> merge-recursive.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 1163508811..37bb94fb4d 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -3571,8 +3571,11 @@ int merge_recursive(struct merge_options *opt,
> repo_read_index(opt->repo);
>
> opt->ancestor = "merged common ancestors";
> - 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);
> if (clean < 0) {
> flush_output(opt);
