diff options
| author |  Jeff King <peff@peff.net> | 2018-08-10 19:17:14 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-13 13:48:30 -0700 |
| commit | b1adb38458679af98a057bcdc988a7f6ce1247d6 (patch) | |
| tree | f90ed55fe0320035df46644afffa5c19dd0b5c53 | |
| parent | t1006: test cat-file --batch-all-objects with duplicates (diff) | |
| download | tgif-b1adb38458679af98a057bcdc988a7f6ce1247d6.tar.xz | |
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>
| -rw-r--r-- | builtin/cat-file.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 4a44b2404f..2d34f3b867 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -420,18 +420,18 @@ static int batch_object_cb(const struct object_id *oid, void *vdata) return 0; } -static int batch_loose_object(const struct object_id *oid, - const char *path, - void *data) +static int collect_loose_object(const struct object_id *oid, + const char *path, + void *data) { oid_array_append(data, oid); return 0; } -static int batch_packed_object(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, - void *data) +static int collect_packed_object(const struct object_id *oid, + struct packed_git *pack, + uint32_t pos, + void *data) { oid_array_append(data, oid); return 0; @@ -476,8 +476,8 @@ static int batch_objects(struct batch_options *opt) struct oid_array sa = OID_ARRAY_INIT; struct object_cb_data cb; - for_each_loose_object(batch_loose_object, &sa, 0); - for_each_packed_object(batch_packed_object, &sa, 0); + for_each_loose_object(collect_loose_object, &sa, 0); + for_each_packed_object(collect_packed_object, &sa, 0); if (repository_format_partial_clone) warning("This repository has extensions.partialClone set. Some objects may not be loaded."); |