[PATCH 5/9] builtin/cat-file: support "object:type=" objects filter
From: Patrick Steinhardt <hidden>
Date: 2025-02-21 07:47:39
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Implement support for the "object:type=" filter in git-cat-file(1), which causes us to omit all objects that don't match the provided object type. Signed-off-by: Patrick Steinhardt <redacted> --- Documentation/git-cat-file.adoc | 3 +++ builtin/cat-file.c | 8 +++++++- t/t1006-cat-file.sh | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-cat-file.adoc b/Documentation/git-cat-file.adoc
index 8c474418b52..540d9dffdf9 100644
--- a/Documentation/git-cat-file.adoc
+++ b/Documentation/git-cat-file.adoc@@ -93,6 +93,9 @@ The form '--filter=blob:limit=<n>[kmg]' omits blobs of size at least n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'. ++ +The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects +which are not of the requested type. --path=<path>:: For use with `--textconv` or `--filters`, to allow specifying an object
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f57bf65cb03..b374c2bb104 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c@@ -474,7 +474,8 @@ static void batch_object_write(const char *obj_name, if (use_mailmap || opt->objects_filter.choice == LOFC_BLOB_NONE || - opt->objects_filter.choice == LOFC_BLOB_LIMIT) + opt->objects_filter.choice == LOFC_BLOB_LIMIT || + opt->objects_filter.choice == LOFC_OBJECT_TYPE) data->info.typep = &data->type; if (opt->objects_filter.choice == LOFC_BLOB_LIMIT) data->info.sizep = &data->size;
@@ -505,6 +506,10 @@ static void batch_object_write(const char *obj_name, data->size >= opt->objects_filter.blob_limit_value) return; break; + case LOFC_OBJECT_TYPE: + if (data->type != opt->objects_filter.object_type) + return; + break; default: BUG("unsupported objects filter"); }
@@ -1047,6 +1052,7 @@ int cmd_cat_file(int argc, break; case LOFC_BLOB_NONE: case LOFC_BLOB_LIMIT: + case LOFC_OBJECT_TYPE: if (!batch.enabled) usage(_("objects filter only supported in batch mode")); break;
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 86c53e01b2f..b908bbf60e1 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh@@ -1388,7 +1388,7 @@ test_expect_success 'objects filter with unknown option' ' test_cmp expect err ' -for option in object:type=tag sparse:oid=1234 tree:1 sparse:path=x +for option in sparse:oid=1234 tree:1 sparse:path=x do test_expect_success "objects filter with unsupported option $option" ' case "$option" in
@@ -1425,5 +1425,9 @@ test_objects_filter "blob:limit=1" test_objects_filter "blob:limit=500" test_objects_filter "blob:limit=1000" test_objects_filter "blob:limit=1g" +test_objects_filter "object:type=blob" +test_objects_filter "object:type=commit" +test_objects_filter "object:type=tag" +test_objects_filter "object:type=tree" test_done
--
2.48.1.683.gf705b3209c.dirty