From: Taylor Blau Date: Mon, 04 May 2026 00:11:23 GMT Subject: [RFC PATCH 3/7] path-walk: support `object:type` filter Message-ID: In-Reply-To: The `object:type` filter accepts only objects of a single type; it is the second member of the object-info-only filter family that bitmap traversal already supports. Like `blob:none` and `tree:0`, it can be evaluated with nothing more than the object's type, which is exactly the granularity path-walk's existing info->{commits,trees,blobs,tags} flags already control. Map `LOFC_OBJECT_TYPE` in `prepare_filters()` by AND-ing each flag against the filtered type. A single `object:type=X` filter applied to the default info (all flags = 1) leaves `info->X = 1` and all the others 0, which is what we want. Using an AND rather than straight assignment prepares us for a subsequent change to implement combined object filters. The path-walk machinery is mostly already wired for the per-type distinction: - `walk_path()` calls `path_fn` for a batch only when the corresponding `info->X` flag is set, so unwanted types are silently not reported. - `add_tree_entries()` skips tree entries of type `OBJ_BLOB` when `info->blobs` is unset, so we don't even allocate paths for them. - The commit-walk loop short-circuits the root-tree fetch when `!info->trees && !info->blobs`, so commit-only filters don't descend into trees at all. But there are a couple of side effects of the "trees off, blobs on" case that need fixing: 1. 'setup_pending_objects()' previously skipped pending trees as soon as `info->trees` was zero. For 'object:type=blob' the call site needs those pending trees: a lightweight tag pointing to a tree, or an annotated tag whose peeled target is a tree, can both reach blobs that are otherwise unreachable from any commit's root tree. Loosen the gate to "if (!info->trees && !info->blobs) continue" and similarly retrieve the root_tree_list whenever either trees or blobs are wanted. 2. The revision machinery's `handle_commit()` drops pending trees when `revs->tree_objects` is zero (see the 'OBJ_TREE' handler in revision.c), so by the time path-walk sees the pending list after `prepare_revision_walk()` the tree-bearing pendings would already be gone. Fix this by setting revs->tree_objects = info->trees || info->blobs so pending trees survive `prepare_revision_walk()` whenever we need to walk into them. Path-walk still resets tree_objects to zero immediately after `prepare_revision_walk()` returns, so the rev-walk itself never enumerates trees redundantly with path-walk's own descent. Add coverage in t6601 for each of the four `object:type` values. The 'object:type=blob' test in particular asserts that file2 and child/file (both reachable only through tag-pointed trees) show up in the output, exercising the pending-tree fix. Update Documentation/git-pack-objects.adoc to add object:type to the list of supported --filter forms. Signed-off-by: Taylor Blau --- Documentation/git-pack-objects.adoc | 7 ++- path-walk.c | 23 +++++++- t/t6601-path-walk.sh | 86 +++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 6 deletions(-) diff --git a/Documentation/git-pack-objects.adoc b/Documentation/git-pack-objects.adoc index cfb5bc0ae16..22c782611d2 100644 --- a/Documentation/git-pack-objects.adoc +++ b/Documentation/git-pack-objects.adoc @@ -404,9 +404,10 @@ will be automatically changed to version `1`. + Incompatible with `--delta-islands`. Path-walk supports the `--filter=` forms `blob:none`, `blob:limit=`, -`sparse:oid=`, and `tree:0`. Other filter forms fall back to the -regular object traversal. The `--use-bitmap-index` option will be -ignored in the presence of `--path-walk`. +`sparse:oid=`, `tree:0`, and `object:type=`. Other filter +forms fall back to the regular object traversal. The +`--use-bitmap-index` option will be ignored in the presence of +`--path-walk`. DELTA ISLANDS diff --git a/path-walk.c b/path-walk.c index 36a1e5b967a..b9902abbb75 100644 --- a/path-walk.c +++ b/path-walk.c @@ -430,7 +430,7 @@ static int setup_pending_objects(struct path_walk_info *info, CALLOC_ARRAY(tags, 1); if (info->blobs) CALLOC_ARRAY(tagged_blobs, 1); - if (info->trees) + if (info->trees || info->blobs) root_tree_list = strmap_get(&ctx->paths_to_lists, root_path); /* @@ -475,7 +475,7 @@ static int setup_pending_objects(struct path_walk_info *info, switch (obj->type) { case OBJ_TREE: - if (!info->trees) + if (!info->trees && !info->blobs) continue; if (pending->path) { char *path = *pending->path ? xstrfmt("%s/", pending->path) @@ -577,6 +577,16 @@ static int prepare_filters(struct path_walk_info *info, } return 1; + case LOFC_OBJECT_TYPE: + if (info) { + info->commits &= options->object_type == OBJ_COMMIT; + info->tags &= options->object_type == OBJ_TAG; + info->trees &= options->object_type == OBJ_TREE; + info->blobs &= options->object_type == OBJ_BLOB; + list_objects_filter_release(options); + } + return 1; + case LOFC_SPARSE_OID: if (info) { struct object_id sparse_oid; @@ -683,9 +693,16 @@ int walk_objects_by_path(struct path_walk_info *info) /* * Set these values before preparing the walk to catch * lightweight tags pointing to non-commits and indexed objects. + * + * Keep tree_objects set whenever blobs are wanted: blobs may + * be reachable through trees that show up as pending objects + * (e.g., via lightweight tags pointing to trees, or annotated + * tags whose peeled target is a tree). Without tree_objects, + * prepare_revision_walk() would discard those pending trees + * and we would never descend into them. */ info->revs->blob_objects = info->blobs; - info->revs->tree_objects = info->trees; + info->revs->tree_objects = info->trees || info->blobs; if (prepare_revision_walk(info->revs)) die(_("failed to setup revision walk")); diff --git a/t/t6601-path-walk.sh b/t/t6601-path-walk.sh index 72e09211e63..13016e62ab1 100755 --- a/t/t6601-path-walk.sh +++ b/t/t6601-path-walk.sh @@ -635,6 +635,92 @@ test_expect_success 'tree:1 filter is rejected' ' test_grep "tree:1 filter not supported by the path-walk API" err ' +test_expect_success 'all, object:type=commit filter' ' + test-tool path-walk --filter=object:type=commit -- --all >out && + + cat >expect <<-EOF && + 0:commit::$(git rev-parse topic) + 0:commit::$(git rev-parse base) + 0:commit::$(git rev-parse base~1) + 0:commit::$(git rev-parse base~2) + blobs:0 + commits:4 + tags:0 + trees:0 + EOF + + test_cmp_sorted expect out +' + +test_expect_success 'all, object:type=tag filter' ' + test-tool path-walk --filter=object:type=tag -- --all >out && + + cat >expect <<-EOF && + 0:tag:/tags:$(git rev-parse refs/tags/first) + 0:tag:/tags:$(git rev-parse refs/tags/second.1) + 0:tag:/tags:$(git rev-parse refs/tags/second.2) + 0:tag:/tags:$(git rev-parse refs/tags/third) + 0:tag:/tags:$(git rev-parse refs/tags/fourth) + 0:tag:/tags:$(git rev-parse refs/tags/tree-tag) + 0:tag:/tags:$(git rev-parse refs/tags/blob-tag) + blobs:0 + commits:0 + tags:7 + trees:0 + EOF + + test_cmp_sorted expect out +' + +test_expect_success 'all, object:type=tree filter' ' + test-tool path-walk --filter=object:type=tree -- --all >out && + + cat >expect <<-EOF && + 0:tree::$(git rev-parse topic^{tree}) + 0:tree::$(git rev-parse base^{tree}) + 0:tree::$(git rev-parse base~1^{tree}) + 0:tree::$(git rev-parse base~2^{tree}) + 0:tree::$(git rev-parse refs/tags/tree-tag^{}) + 0:tree::$(git rev-parse refs/tags/tree-tag2^{}) + 1:tree:a/:$(git rev-parse base:a) + 2:tree:child/:$(git rev-parse refs/tags/tree-tag:child) + 3:tree:left/:$(git rev-parse base:left) + 3:tree:left/:$(git rev-parse base~2:left) + 4:tree:right/:$(git rev-parse topic:right) + 4:tree:right/:$(git rev-parse base~1:right) + 4:tree:right/:$(git rev-parse base~2:right) + blobs:0 + commits:0 + tags:0 + trees:13 + EOF + + test_cmp_sorted expect out +' + +test_expect_success 'all, object:type=blob filter' ' + test-tool path-walk --filter=object:type=blob -- --all >out && + + cat >expect <<-EOF && + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{}) + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{}) + 1:blob:a:$(git rev-parse base~2:a) + 2:blob:file2:$(git rev-parse refs/tags/tree-tag2^{}:file2) + 3:blob:child/file:$(git rev-parse refs/tags/tree-tag:child/file) + 4:blob:left/b:$(git rev-parse base:left/b) + 4:blob:left/b:$(git rev-parse base~2:left/b) + 5:blob:right/c:$(git rev-parse base~2:right/c) + 5:blob:right/c:$(git rev-parse topic:right/c) + 6:blob:right/d:$(git rev-parse base~1:right/d) + blobs:10 + commits:0 + tags:0 + trees:0 + EOF + + test_cmp_sorted expect out +' + test_expect_success 'setup sparse filter blob' ' # Cone-mode patterns: include root, exclude all dirs, include left/ cat >patterns <<-\EOF && -- 2.54.0.4.g6aa0d38a4ec