@@ -216,7 +216,8 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
216
216
return filled ;
217
217
}
218
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 ,
220
221
int n ,
221
222
struct commit * * twos ,
222
223
int cleanup )
@@ -226,7 +227,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
226
227
struct commit_list * result ;
227
228
int cnt , i ;
228
229
229
- result = merge_bases_many (the_repository , one , n , twos );
230
+ result = merge_bases_many (r , one , n , twos );
230
231
for (i = 0 ; i < n ; i ++ ) {
231
232
if (one == twos [i ])
232
233
return result ;
@@ -249,7 +250,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
249
250
clear_commit_marks (one , all_flags );
250
251
clear_commit_marks_many (n , twos , all_flags );
251
252
252
- cnt = remove_redundant (the_repository , rslt , cnt );
253
+ cnt = remove_redundant (r , rslt , cnt );
253
254
result = NULL ;
254
255
for (i = 0 ; i < cnt ; i ++ )
255
256
commit_list_insert_by_date (rslt [i ], & result );
@@ -261,19 +262,19 @@ struct commit_list *get_merge_bases_many(struct commit *one,
261
262
int n ,
262
263
struct commit * * twos )
263
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 );
265
266
}
266
267
267
268
struct commit_list * get_merge_bases_many_dirty (struct commit * one ,
268
269
int n ,
269
270
struct commit * * twos )
270
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 );
272
273
}
273
274
274
275
struct commit_list * get_merge_bases (struct commit * one , struct commit * two )
275
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 );
277
278
}
278
279
279
280
/*
0 commit comments