From: Stefan Beller Date: Tue, 06 Feb 2018 00:17:18 GMT Subject: [PATCH 163/194] commit: add repository argument to merge_bases_many Message-ID: <20180206001749.218943-65-sbeller@google.com> In-Reply-To: <20180206001749.218943-1-sbeller@google.com> Signed-off-by: Stefan Beller --- commit.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commit.c b/commit.c index a4f35cd9fc..ed7349bbd7 100644 --- a/commit.c +++ b/commit.c @@ -854,7 +854,8 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n, struc return result; } -static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) +#define merge_bases_many(r, o, n, t) merge_bases_many_##r(o, n, t) +static struct commit_list *merge_bases_many_the_repository(struct commit *one, int n, struct commit **twos) { struct commit_list *list = NULL; struct commit_list *result = NULL; @@ -980,7 +981,7 @@ static struct commit_list *get_merge_bases_many_0_the_repository(struct commit * struct commit_list *result; int cnt, i; - result = merge_bases_many(one, n, twos); + result = merge_bases_many(the_repository, one, n, twos); for (i = 0; i < n; i++) { if (one == twos[i]) return result; -- 2.15.1.433.g936d1b9894.dirty