cat-file: rename batch_{loose,packed}_object callbacks
We're not really doing the batch-show operation in these callbacks, but just collecting the set of objects. That distinction will become more important in a future patch, so let's rename them now to avoid cluttering that diff. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Aug 10, 2018 at 19:17 UTC
b1adb38458679af98a057bcdc988a7f6ce1247d6
1 file changed
+9
-9
builtin/cat-file.c
+9
-9
@@ -420,18 +420,18 @@ static int batch_object_cb(const struct object_id *oid, void *vdata)
420
return 0;
421
}
422
423
-static int batch_loose_object(const struct object_id *oid,
424
- const char *path,
425
- void *data)
423
+static int collect_loose_object(const struct object_id *oid,
424
+ const char *path,
425
+ void *data)
426
{
427
oid_array_append(data, oid);
428
return 0;
429
}
430
431
-static int batch_packed_object(const struct object_id *oid,
432
- struct packed_git *pack,
433
- uint32_t pos,
434
- void *data)
431
+static int collect_packed_object(const struct object_id *oid,
432
+ struct packed_git *pack,
433
+ uint32_t pos,
434
+ void *data)
435
{
436
oid_array_append(data, oid);
437
return 0;
@@ -476,8 +476,8 @@ static int batch_objects(struct batch_options *opt)
476
struct oid_array sa = OID_ARRAY_INIT;
477
struct object_cb_data cb;
478
479
- for_each_loose_object(batch_loose_object, &sa, 0);
480
- for_each_packed_object(batch_packed_object, &sa, 0);
479
+ for_each_loose_object(collect_loose_object, &sa, 0);
480
+ for_each_packed_object(collect_packed_object, &sa, 0);
481
if (repository_format_partial_clone)
482
warning("This repository has extensions.partialClone set. Some objects may not be loaded.");
483