@matheusbsbs / matheus-bagliano / commits / 2b8d07ef91

path-walk: support `object:type` filter

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 <me@ttaylorr.com> Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed May 22, 2026 at 18:24 UTC 2b8d07ef918404bbe4a63dc266be0596519bc64e

4 files changed +103 -2

Documentation/git-pack-objects.adoc

+1 -1

@@ -405,7 +405,7 @@ will be automatically changed to version `1`.

405 Incompatible with `--delta-islands`. The `--use-bitmap-index` option is

406 ignored in the presence of `--path-walk`. The `--path-walk` option

407 supports the `--filter=<spec>` forms `blob:none`, `blob:limit=<n>`,

408 -`tree:0`, and `sparse:<oid>`.

408 +`tree:0`, `object:type=<type>`, and `sparse:<oid>`.

409

410

411 DELTA ISLANDS

path-walk.c

+12 -1

@@ -382,7 +382,7 @@ static int walk_path(struct path_walk_context *ctx,

382 ret = ctx->info->path_fn(path, &filtered, list->type,

383 ctx->info->path_fn_data);

384 oid_array_clear(&filtered);

385 - } else if (path_is_for_direct_objects(path) ||

385 + } else if ((!ctx->info->strict_types && path_is_for_direct_objects(path)) ||

386 (list->type == OBJ_TREE && ctx->info->trees) ||

387 (list->type == OBJ_BLOB && ctx->info->blobs) ||

388 (list->type == OBJ_TAG && ctx->info->tags)) {

@@ -608,6 +608,17 @@ static int prepare_filters(struct path_walk_info *info,

608 }

609 return 1;

610

611 + case LOFC_OBJECT_TYPE:

612 + if (info) {

613 + info->commits &= options->object_type == OBJ_COMMIT;

614 + info->tags &= options->object_type == OBJ_TAG;

615 + info->trees &= options->object_type == OBJ_TREE;

616 + info->blobs &= options->object_type == OBJ_BLOB;

617 + info->strict_types = 1;

618 + list_objects_filter_release(options);

619 + }

620 + return 1;

621 +

622 case LOFC_SPARSE_OID:

623 if (info) {

624 struct object_id sparse_oid;

path-walk.h

@@ -47,6 +47,12 @@ struct path_walk_info {

47 int blobs;

48 int tags;

50 + /**

51 + * If 'strict_types' is 0, then direct object requests will no longer

52 + * override the object type restrictions.

53 + */

54 + int strict_types;

55 +

56 /**

57 * If non-zero, specifies a maximum blob size. Blobs with a

58 * size equal to or greater than this limit will not be

t/t6601-path-walk.sh

+84

@@ -643,6 +643,90 @@ test_expect_success 'tree:1 filter is rejected' '

643 test_grep "tree:1 filter not supported by the path-walk API" err

644 '

645

646 +test_expect_success 'all, object:type=commit filter' '

647 + test-tool path-walk --filter=object:type=commit -- --all >out &&

648 +

649 + cat >expect <<-EOF &&

650 + 0:commit::$(git rev-parse topic)

651 + 0:commit::$(git rev-parse base)

652 + 0:commit::$(git rev-parse base~1)

653 + 0:commit::$(git rev-parse base~2)

654 + blobs:0

655 + commits:4

656 + tags:0

657 + trees:0

658 + EOF

659 +

660 + test_cmp_sorted expect out

661 +'

662 +

663 +test_expect_success 'all, object:type=tag filter' '

664 + test-tool path-walk --filter=object:type=tag -- --all >out &&

665 +

666 + cat >expect <<-EOF &&

667 + 0:tag:/tags:$(git rev-parse refs/tags/first)

668 + 0:tag:/tags:$(git rev-parse refs/tags/second.1)

669 + 0:tag:/tags:$(git rev-parse refs/tags/second.2)

670 + 0:tag:/tags:$(git rev-parse refs/tags/third)

671 + 0:tag:/tags:$(git rev-parse refs/tags/fourth)

672 + 0:tag:/tags:$(git rev-parse refs/tags/tree-tag)

673 + 0:tag:/tags:$(git rev-parse refs/tags/blob-tag)

674 + blobs:0

675 + commits:0

676 + tags:7

677 + trees:0

678 + EOF

679 +

680 + test_cmp_sorted expect out

681 +'

682 +

683 +test_expect_success 'all, object:type=tree filter' '

684 + test-tool path-walk --filter=object:type=tree -- --all >out &&

685 +

686 + cat >expect <<-EOF &&

687 + 0:tree::$(git rev-parse topic^{tree})

688 + 0:tree::$(git rev-parse base^{tree})

689 + 0:tree::$(git rev-parse base~1^{tree})

690 + 0:tree::$(git rev-parse base~2^{tree})

691 + 1:tree:/tagged-trees:$(git rev-parse refs/tags/tree-tag^{})

692 + 1:tree:/tagged-trees:$(git rev-parse refs/tags/tree-tag2^{})

693 + 2:tree:a/:$(git rev-parse base:a)

694 + 3:tree:child/:$(git rev-parse refs/tags/tree-tag:child)

695 + 4:tree:left/:$(git rev-parse base:left)

696 + 4:tree:left/:$(git rev-parse base~2:left)

697 + 5:tree:right/:$(git rev-parse topic:right)

698 + 5:tree:right/:$(git rev-parse base~1:right)

699 + 5:tree:right/:$(git rev-parse base~2:right)

700 + blobs:0

701 + commits:0

702 + tags:0

703 + trees:13

704 + EOF

705 +

706 + test_cmp_sorted expect out

707 +'

708 +

709 +test_expect_success 'all, object:type=blob filter' '

710 + test-tool path-walk --filter=object:type=blob -- --all >out &&

711 +

712 + cat >expect <<-EOF &&

713 + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{})

714 + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})

715 + 1:blob:a:$(git rev-parse base~2:a)

716 + 2:blob:left/b:$(git rev-parse base:left/b)

717 + 2:blob:left/b:$(git rev-parse base~2:left/b)

718 + 3:blob:right/c:$(git rev-parse base~2:right/c)

719 + 3:blob:right/c:$(git rev-parse topic:right/c)

720 + 4:blob:right/d:$(git rev-parse base~1:right/d)

721 + blobs:8

722 + commits:0

723 + tags:0

724 + trees:0

725 + EOF

726 +

727 + test_cmp_sorted expect out

728 +'

729 +

730 test_expect_success 'setup sparse filter blob' '

731 # Cone-mode patterns: include root, exclude all dirs, include left/

732 cat >patterns <<-\EOF &&