cocci: apply the "commit-reach.h" part of "the_repository.pending"

[thirdparty/git.git] / builtin / merge-tree.c

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 828dc81c426514d822e6bbce172495373f9a92c5..4e4a9d6ba177499191716ddd0b02132b606e9620 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -452,7 +452,8 @@ static int real_merge(struct merge_tree_options *o,
                 * Get the merge bases, in reverse order; see comment above
                 * merge_incore_recursive in merge-ort.h
                 */
-               merge_bases = get_merge_bases(parent1, parent2);
+               merge_bases = repo_get_merge_bases(the_repository, parent1,
+                                                  parent2);
                if (!merge_bases && !o->allow_unrelated_histories)
                        die(_("refusing to merge unrelated histories"));
                merge_bases = reverse_commit_list(merge_bases);