From: Stefan Beller Date: Tue, 06 Feb 2018 00:17:17 GMT Subject: [PATCH 162/194] commit: add repository argument to get_merge_bases_many_0 Message-ID: <20180206001749.218943-64-sbeller@google.com> In-Reply-To: <20180206001749.218943-1-sbeller@google.com> Signed-off-by: Stefan Beller --- commit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/commit.c b/commit.c index bd9049a9df..a4f35cd9fc 100644 --- a/commit.c +++ b/commit.c @@ -969,7 +969,8 @@ static int remove_redundant(struct commit **array, int cnt) return filled; } -static struct commit_list *get_merge_bases_many_0(struct commit *one, +#define get_merge_bases_many_0(r, o, n, t, c) get_merge_bases_many_0_##r(o, n, t, c) +static struct commit_list *get_merge_bases_many_0_the_repository(struct commit *one, int n, struct commit **twos, int cleanup) @@ -1014,19 +1015,19 @@ struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos) { - return get_merge_bases_many_0(one, n, twos, 1); + return get_merge_bases_many_0(the_repository, one, n, twos, 1); } struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos) { - return get_merge_bases_many_0(one, n, twos, 0); + return get_merge_bases_many_0(the_repository, one, n, twos, 0); } struct commit_list *get_merge_bases(struct commit *one, struct commit *two) { - return get_merge_bases_many_0(one, 1, &two, 1); + return get_merge_bases_many_0(the_repository, one, 1, &two, 1); } /* -- 2.15.1.433.g936d1b9894.dirty