@@ -95,7 +95,9 @@ static struct commit_list *paint_down_to_common(struct repository *r,
95
95
return result ;
96
96
}
97
97
98
- static struct commit_list * merge_bases_many (struct commit * one , int n , struct commit * * twos )
98
+ static struct commit_list * merge_bases_many (struct repository * r ,
99
+ struct commit * one , int n ,
100
+ struct commit * * twos )
99
101
{
100
102
struct commit_list * list = NULL ;
101
103
struct commit_list * result = NULL ;
@@ -110,14 +112,14 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
110
112
return commit_list_insert (one , & result );
111
113
}
112
114
113
- if (parse_commit ( one ))
115
+ if (repo_parse_commit ( r , one ))
114
116
return NULL ;
115
117
for (i = 0 ; i < n ; i ++ ) {
116
- if (parse_commit ( twos [i ]))
118
+ if (repo_parse_commit ( r , twos [i ]))
117
119
return NULL ;
118
120
}
119
121
120
- list = paint_down_to_common (the_repository , one , n , twos , 0 );
122
+ list = paint_down_to_common (r , one , n , twos , 0 );
121
123
122
124
while (list ) {
123
125
struct commit * commit = pop_commit (& list );
@@ -224,7 +226,7 @@ static struct commit_list *get_merge_bases_many_0(struct commit *one,
224
226
struct commit_list * result ;
225
227
int cnt , i ;
226
228
227
- result = merge_bases_many (one , n , twos );
229
+ result = merge_bases_many (the_repository , one , n , twos );
228
230
for (i = 0 ; i < n ; i ++ ) {
229
231
if (one == twos [i ])
230
232
return result ;
0 commit comments