diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:21 -0700 |
| commit | a271b05066a1fd2c3a62508d9908d6c5df14a1cb (patch) | |
| tree | 57e55fd6b395f8e5da4e23e1344c55d0d38ed80c /builtin/pack-objects.c | |
| parent | Merge branch 'ps/test-wo-perl-prereq' (diff) | |
| parent | builtin/cat-file: use bitmaps to efficiently filter by object type (diff) | |
| download | git-a271b05066a1fd2c3a62508d9908d6c5df14a1cb.tar.gz git-a271b05066a1fd2c3a62508d9908d6c5df14a1cb.zip | |
Merge branch 'ps/cat-file-filter-batch'
"git cat-file --batch" and friends learned to allow "--filter=" to
omit certain objects, just like the transport layer does.
* ps/cat-file-filter-batch:
builtin/cat-file: use bitmaps to efficiently filter by object type
builtin/cat-file: deduplicate logic to iterate over all objects
pack-bitmap: introduce function to check whether a pack is bitmapped
pack-bitmap: add function to iterate over filtered bitmapped objects
pack-bitmap: allow passing payloads to `show_reachable_fn()`
builtin/cat-file: support "object:type=" objects filter
builtin/cat-file: support "blob:limit=" objects filter
builtin/cat-file: support "blob:none" objects filter
builtin/cat-file: wire up an option to filter objects
builtin/cat-file: introduce function to report object status
builtin/cat-file: rename variable that tracks usage
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 4764aa1b8c..3973267e9e 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1820,7 +1820,8 @@ static int add_object_entry(const struct object_id *oid, enum object_type type, static int add_object_entry_from_bitmap(const struct object_id *oid, enum object_type type, int flags UNUSED, uint32_t name_hash, - struct packed_git *pack, off_t offset) + struct packed_git *pack, off_t offset, + void *payload UNUSED) { display_progress(progress_state, ++nr_seen); |