Skip to content

pack-objects: fix and simplify --filter handling

René Scharfe git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest5 patches 5 repliesIn review
  2. v23 patches 20 repliesSuperseded
  3. v13 patches 10 repliesSuperseded

Changes in v3 from the cover letter

- Split the code changes up again like in v1; keep the separate test patches. Reverting 5cb28270a1 wholesale is too cumbersome.
- Bring the dedicated list_objects_filter_options struct back.
- Move the list_objects_filter_release() call to the cleanup section.

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5t5317: stop losing return codes of git ls-filest/t5317-pack-objects-filter-objects.sh+28 -240 replies
2/5t5317: demonstrate failure to handle multiple --filter optionst/t5317-pack-objects-filter-objects.sh+38 -00 replies
3/5pack-objects: fix handling of multiple --filter optionsbuiltin/pack-objects.c t/t5317-pack-objects-filter-objects.sh+3 -22 replies
4/5pack-objects: simplify --filter handlingbuiltin/pack-objects.c+6 -222 replies
5/5list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()list-objects-filter-options.c list-objects-filter-options.h+2 -201 reply

Reviews trailers per patch

None of the 5 patches has a Reviewed-by or Acked-by.

PatchÆvar Arnfjörð Bjarmason
1/5
2/5
3/5
4/5Helped-by
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/5] pack-objects: fix and simplify --filter handling

Fix a regression that prevents using multiple --filter options, simplify the option parsing code and avoid relying on undefined behavior in it.

Patch 4 conflicts with cc/filtered-repack in seen, but not semantically.

Changes since v2:
- Split the code changes up again like in v1; keep the separate test patches. Reverting 5cb28270a1 wholesale is too cumbersome.
- Bring the dedicated list_objects_filter_options struct back.
- Move the list_objects_filter_release() call to the cleanup section.

Changes since v1:
- Added patch 1 to fix an issue with existing tests.
- Separate patch 2 for new tests.
- Test using blob size filters, only, which is a bit simpler.
- Test both combinations to also catch not just the current last-one-wins regression, but also a possible future first-one-wins issue.
- Actually revert 5cb28270a1 (pack-objects: lazily set up "struct rev_info", don't leak, 2022-03-28) instead of having a minimal fix and then adding some kind of middle ground by using a separate struct list_objects_filter_options.

t5317: stop losing return codes of git ls-files
t5317: demonstrate failure to handle multiple --filter options
pack-objects: fix handling of multiple --filter options
pack-objects: simplify --filter handling
list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()

 builtin/pack-objects.c                 | 27 ++------
 list-objects-filter-options.c          |  4 --
 list-objects-filter-options.h          | 18 +-----
 t/t5317-pack-objects-filter-objects.sh | 90 +++++++++++++++++++-------
 4 files changed, 74 insertions(+), 65 deletions(-)

Range-Diff gegen v2:

1:  955ec33c30 = 1:  955ec33c30 t5317: stop losing return codes of git ls-files
2:  966094ef98 = 2:  966094ef98 t5317: demonstrate failure to handle multiple --filter options
3:  f5ba2a2f5e < -:  ---------- Revert "pack-objects: lazily set up "struct rev_info", don't leak"
-:  ---------- > 3:  d51424e8d1 pack-objects: fix handling of multiple --filter options
-:  ---------- > 4:  e1fa0fcb1a pack-objects: simplify --filter handling
-:  ---------- > 5:  5865e24c04 list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()

--
2.38.1