@@ -30,7 +30,8 @@ static int queue_has_nonstale(struct prio_queue *queue)
30
30
}
31
31
32
32
/* all input commits in one and twos[] must have been parsed! */
33
- static struct commit_list * paint_down_to_common (struct commit * one , int n ,
33
+ static struct commit_list * paint_down_to_common (struct repository * r ,
34
+ struct commit * one , int n ,
34
35
struct commit * * twos ,
35
36
int min_generation )
36
37
{
@@ -83,7 +84,7 @@ static struct commit_list *paint_down_to_common(struct commit *one, int n,
83
84
parents = parents -> next ;
84
85
if ((p -> object .flags & flags ) == flags )
85
86
continue ;
86
- if (parse_commit ( p ))
87
+ if (repo_parse_commit ( r , p ))
87
88
return NULL ;
88
89
p -> object .flags |= flags ;
89
90
prio_queue_put (& queue , p );
@@ -116,7 +117,7 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
116
117
return NULL ;
117
118
}
118
119
119
- list = paint_down_to_common (one , n , twos , 0 );
120
+ list = paint_down_to_common (the_repository , one , n , twos , 0 );
120
121
121
122
while (list ) {
122
123
struct commit * commit = pop_commit (& list );
@@ -187,8 +188,8 @@ static int remove_redundant(struct commit **array, int cnt)
187
188
if (array [j ]-> generation < min_generation )
188
189
min_generation = array [j ]-> generation ;
189
190
}
190
- common = paint_down_to_common (array [i ], filled , work ,
191
- min_generation );
191
+ common = paint_down_to_common (the_repository , array [i ], filled ,
192
+ work , min_generation );
192
193
if (array [i ]-> object .flags & PARENT2 )
193
194
redundant [i ] = 1 ;
194
195
for (j = 0 ; j < filled ; j ++ )
@@ -322,7 +323,9 @@ int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit *
322
323
if (commit -> generation > min_generation )
323
324
return ret ;
324
325
325
- bases = paint_down_to_common (commit , nr_reference , reference , commit -> generation );
326
+ bases = paint_down_to_common (the_repository , commit ,
327
+ nr_reference , reference ,
328
+ commit -> generation );
326
329
if (commit -> object .flags & PARENT2 )
327
330
ret = 1 ;
328
331
clear_commit_marks (commit , all_flags );
0 commit comments