commit-reach.c: allow get_merge_bases_many_0 to handle any repo
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Nov 13, 2018 at 16:12 UTC
f28e87f526949c547308c16426cc4607464c5f37
1 file changed
+7
-6
commit-reach.c
+7
-6
@@ -216,7 +216,8 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
216
return filled;
217
}
218
219
-static struct commit_list *get_merge_bases_many_0(struct commit *one,
219
+static struct commit_list *get_merge_bases_many_0(struct repository *r,
220
+ struct commit *one,
221
int n,
222
struct commit **twos,
223
int cleanup)
@@ -226,7 +227,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
227
struct commit_list *result;
228
int cnt, i;
229
229
- result = merge_bases_many(the_repository, one, n, twos);
230
+ result = merge_bases_many(r, one, n, twos);
231
for (i = 0; i < n; i++) {
232
if (one == twos[i])
233
return result;
@@ -249,7 +250,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
250
clear_commit_marks(one, all_flags);
251
clear_commit_marks_many(n, twos, all_flags);
252
252
- cnt = remove_redundant(the_repository, rslt, cnt);
253
+ cnt = remove_redundant(r, rslt, cnt);
254
result = NULL;
255
for (i = 0; i < cnt; i++)
256
commit_list_insert_by_date(rslt[i], &result);
@@ -261,19 +262,19 @@ struct commit_list *get_merge_bases_many(struct commit *one,
262
int n,
263
struct commit **twos)
264
{
264
- return get_merge_bases_many_0(one, n, twos, 1);
265
+ return get_merge_bases_many_0(the_repository, one, n, twos, 1);
266
}
267
268
struct commit_list *get_merge_bases_many_dirty(struct commit *one,
269
int n,
270
struct commit **twos)
271
{
271
- return get_merge_bases_many_0(one, n, twos, 0);
272
+ return get_merge_bases_many_0(the_repository, one, n, twos, 0);
273
}
274
275
struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
276
{
276
- return get_merge_bases_many_0(one, 1, &two, 1);
277
+ return get_merge_bases_many_0(the_repository, one, 1, &two, 1);
278
}
279
280
/*