path-walk: support `combine` filter

The `combine` filter takes the intersection of its children, that is: objects are shown only when all child filters would admit the object. The preceding patches added support for many individual filter types. Enable users to compose these filters by implementing support for the `combine` filter type. Mapping intersection onto path_walk_info works because every supported child filter is a monotonic restriction: - `blob:none`, `tree:0` unconditionally clear `info->blobs` and (for `tree:0`) `info->trees`; clearing an already-cleared flag is a no-op. - `object:type=X` is now expressed as an AND of each type flag with the filtered type, so applying multiple such filters only refines the existing set rather than overwrites it. - `blob:limit=N` has to compose too: the intersection of "size < L1" and "size < L2" is "size < min(L1, L2)". Update the `LOFC_BLOB_LIMIT` handler to take the running minimum when `info->blob_limit` is already set, so a combined filter with, e.g., both "blob:limit=10" and "blob:limit=5" produces a limit of 5 regardless of ordering. - `sparse:oid` is left unchanged. A `combine` filter that includes a `sparse:oid` is allowed at most once, since the existing handler refuses to overwrite `info->pl`. Two `sparse:oid` filters in a single `combine` would be unusual and are rejected with a warning, matching the standalone `sparse:oid` behavior. Implementation-wise, the existing `prepare_filters()` called `list_objects_filter_release()` inside each case branch. That works fine for top-level filters, but `combine` filters need to recurse over its child filters without releasing each one in turn (since the parent's release iterates the sub array). Split `prepare_filters()` into a recursive helper that performs only the mutation, plus a thin wrapper that calls the helper and then releases the top-level filter once. The `LOFC_COMBINE` case in the helper just walks `sub_nr` and recurses; child filters are released by the wrapper's single `list_objects_filter_release()` call on the parent (which itself recursively releases each sub-filter, the same way it always has). If any sub-filter is unsupported (e.g. "tree:1", "sparse:<path>", or a not-yet-supported choice), the recursion bubbles a failure up and the existing pack-objects/backfill fallback paths kick in. Add coverage in t6601: - "combine:blob:none+tree:0" collapses to "tree:0" - "combine:object:type=blob+blob:limit=3" yields only the blobs smaller than three bytes - "combine:object:type=blob+object:type=tree" intersects to empty - "combine:tree:1+blob:none" reports the "tree:1" error. Update Documentation/git-pack-objects.adoc to add combine 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 456efac53b088759abdadb6a33fa9bebdd9945b7
3 files changed +93 -6
Documentation/git-pack-objects.adoc
+2 -1
@@ -405,7 +405,8 @@ 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`, `object:type=<type>`, and `sparse:<oid>`.
408 +`tree:0`, `object:type=<type>`, and `sparse:<oid>`. These supported filter
409 +types can be combined with the `combine:<spec>+<spec>` form.
410
411
412 DELTA ISLANDS
path-walk.c
+20 -5
@@ -571,8 +571,8 @@ static int setup_pending_objects(struct path_walk_info *info,
571 return 0;
572 }
573
574 -static int prepare_filters(struct path_walk_info *info,
575 - struct list_objects_filter_options *options)
574 +static int prepare_filters_one(struct path_walk_info *info,
575 + struct list_objects_filter_options *options)
576 {
577 switch (options->choice) {
578 case LOFC_DISABLED:
@@ -589,7 +589,8 @@ static int prepare_filters(struct path_walk_info *info,
589 if (info) {
590 if (!options->blob_limit_value)
591 info->blobs = 0;
592 - else
592 + else if (!info->blob_limit ||
593 + info->blob_limit > options->blob_limit_value)
594 info->blob_limit = options->blob_limit_value;
595 list_objects_filter_release(options);
596 }
@@ -604,7 +605,6 @@ static int prepare_filters(struct path_walk_info *info,
605 if (info) {
606 info->trees = 0;
607 info->blobs = 0;
607 - list_objects_filter_release(options);
608 }
609 return 1;
610
@@ -656,8 +656,13 @@ static int prepare_filters(struct path_walk_info *info,
656 warning(_("sparse filter is not cone-mode compatible"));
657 return 0;
658 }
659 + }
660 + return 1;
661
660 - list_objects_filter_release(options);
662 + case LOFC_COMBINE:
663 + for (size_t i = 0; i < options->sub_nr; i++) {
664 + if (!prepare_filters_one(info, &options->sub[i]))
665 + return 0;
666 }
667 return 1;
668
@@ -668,6 +673,16 @@ static int prepare_filters(struct path_walk_info *info,
673 }
674 }
675
676 +static int prepare_filters(struct path_walk_info *info,
677 + struct list_objects_filter_options *options)
678 +{
679 + if (!prepare_filters_one(info, options))
680 + return 0;
681 + if (info)
682 + list_objects_filter_release(options);
683 + return 1;
684 +}
685 +
686 int path_walk_filter_compatible(struct list_objects_filter_options *options)
687 {
688 return prepare_filters(NULL, options);
t/t6601-path-walk.sh
+71
@@ -727,6 +727,77 @@ test_expect_success 'all, object:type=blob filter' '
727 test_cmp_sorted expect out
728 '
729
730 +test_expect_success 'all, combine:blob:none+tree:0 filter' '
731 + test-tool path-walk \
732 + --filter=combine:blob:none+tree:0 -- --all >out &&
733 +
734 + cat >expect <<-EOF &&
735 + 0:commit::$(git rev-parse topic)
736 + 0:commit::$(git rev-parse base)
737 + 0:commit::$(git rev-parse base~1)
738 + 0:commit::$(git rev-parse base~2)
739 + 1:tag:/tags:$(git rev-parse refs/tags/first)
740 + 1:tag:/tags:$(git rev-parse refs/tags/second.1)
741 + 1:tag:/tags:$(git rev-parse refs/tags/second.2)
742 + 1:tag:/tags:$(git rev-parse refs/tags/third)
743 + 1:tag:/tags:$(git rev-parse refs/tags/fourth)
744 + 1:tag:/tags:$(git rev-parse refs/tags/tree-tag)
745 + 1:tag:/tags:$(git rev-parse refs/tags/blob-tag)
746 + 2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{})
747 + 2:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
748 + 3:tree:/tagged-trees:$(git rev-parse refs/tags/tree-tag^{tree})
749 + 3:tree:/tagged-trees:$(git rev-parse refs/tags/tree-tag2)
750 + blobs:2
751 + commits:4
752 + tags:7
753 + trees:2
754 + EOF
755 +
756 + test_cmp_sorted expect out
757 +'
758 +
759 +test_expect_success 'all, combine:object:type=blob+blob:limit=3 filter' '
760 + test-tool path-walk \
761 + --filter=combine:object:type=blob+blob:limit=3 \
762 + -- --all >out &&
763 +
764 + cat >expect <<-EOF &&
765 + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag^{})
766 + 0:blob:/tagged-blobs:$(git rev-parse refs/tags/blob-tag2^{})
767 + 1:blob:a:$(git rev-parse base~2:a)
768 + 2:blob:left/b:$(git rev-parse base~2:left/b)
769 + 3:blob:right/c:$(git rev-parse base~2:right/c)
770 + 4:blob:right/d:$(git rev-parse base~1:right/d)
771 + blobs:6
772 + commits:0
773 + tags:0
774 + trees:0
775 + EOF
776 +
777 + test_cmp_sorted expect out
778 +'
779 +
780 +test_expect_success 'all, combine of disjoint object:types is empty' '
781 + test-tool path-walk \
782 + --filter=combine:object:type=blob+object:type=tree \
783 + -- --all >out &&
784 +
785 + cat >expect <<-EOF &&
786 + blobs:0
787 + commits:0
788 + tags:0
789 + trees:0
790 + EOF
791 +
792 + test_cmp_sorted expect out
793 +'
794 +
795 +test_expect_success 'combine: rejects unsupported subfilters' '
796 + test_must_fail test-tool path-walk \
797 + --filter=combine:tree:1+blob:none -- --all 2>err &&
798 + test_grep "tree:1 filter not supported by the path-walk API" err
799 +'
800 +
801 test_expect_success 'setup sparse filter blob' '
802 # Cone-mode patterns: include root, exclude all dirs, include left/
803 cat >patterns <<-\EOF &&