@@ -2288,22 +2288,22 @@ static int remote_tracking(struct remote *remote, const char *refname,
2288
2288
* list during reflog traversals in "check_and_collect_until()".
2289
2289
*/
2290
2290
struct reflog_commit_list {
2291
- struct commit * * items ;
2291
+ struct commit * * item ;
2292
2292
size_t nr , alloc ;
2293
2293
};
2294
2294
2295
2295
/* Append a commit to the list. */
2296
2296
static void append_commit (struct reflog_commit_list * list ,
2297
2297
struct commit * commit )
2298
2298
{
2299
- ALLOC_GROW (list -> items , list -> nr + 1 , list -> alloc );
2300
- list -> items [list -> nr ++ ] = commit ;
2299
+ ALLOC_GROW (list -> item , list -> nr + 1 , list -> alloc );
2300
+ list -> item [list -> nr ++ ] = commit ;
2301
2301
}
2302
2302
2303
2303
/* Free and reset the list. */
2304
2304
static void free_reflog_commit_list (struct reflog_commit_list * list )
2305
2305
{
2306
- FREE_AND_NULL (list -> items );
2306
+ FREE_AND_NULL (list -> item );
2307
2307
list -> nr = list -> alloc = 0 ;
2308
2308
}
2309
2309
@@ -2391,14 +2391,8 @@ static int is_reachable_in_reflog(const char *local, const struct ref *remote)
2391
2391
* Check if the remote commit is reachable from any
2392
2392
* of the commits in the collected list, in batches.
2393
2393
*/
2394
- for (chunk = list .items ; chunk < list .items + list .nr ; chunk += size ) {
2395
- size = list .items + list .nr - chunk ;
2396
-
2397
- /*
2398
- * If the number of remaining entries is more than
2399
- * the batch size, clamp the number of items passed
2400
- * to the maximum batch size.
2401
- */
2394
+ for (chunk = list .item ; chunk < list .item + list .nr ; chunk += size ) {
2395
+ size = list .item + list .nr - chunk ;
2402
2396
if (MERGE_BASES_BATCH_SIZE < size )
2403
2397
size = MERGE_BASES_BATCH_SIZE ;
2404
2398
0 commit comments