undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cat-file: rename batch_{loose,packed}_object callbacks

Browse Source 
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>
This commit is contained in:
Jeff King 2018-08-10 19:17:14 -04:00 committed by Junio C Hamano
parent aa2f5ef500
commit b1adb38458
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/cat-file.c
View File

@ -420,18 +420,18 @@ static int batch_object_cb(const struct object_id *oid, void *vdata)
return 0; return 0;
} }
static int batch_loose_object(const struct object_id *oid, static int collect_loose_object(const struct object_id *oid,
const char *path, const char *path,
void *data) void *data)
{ {
oid_array_append(data, oid); oid_array_append(data, oid);
return 0; return 0;
} }
static int batch_packed_object(const struct object_id *oid, static int collect_packed_object(const struct object_id *oid,
struct packed_git *pack, struct packed_git *pack,
uint32_t pos, uint32_t pos,
void *data) void *data)
{ {
oid_array_append(data, oid); oid_array_append(data, oid);
return 0; return 0;
@ -476,8 +476,8 @@ static int batch_objects(struct batch_options *opt)
struct oid_array sa = OID_ARRAY_INIT; struct oid_array sa = OID_ARRAY_INIT;
struct object_cb_data cb; struct object_cb_data cb;
for_each_loose_object(batch_loose_object, &sa, 0); for_each_loose_object(collect_loose_object, &sa, 0);
for_each_packed_object(batch_packed_object, &sa, 0); for_each_packed_object(collect_packed_object, &sa, 0);
if (repository_format_partial_clone) if (repository_format_partial_clone)
warning("This repository has extensions.partialClone set. Some objects may not be loaded."); warning("This repository has extensions.partialClone set. Some objects may not be loaded.");