Here is a slightly larger reroll of my series to fix object freshening when using multi-cruft packs that I have been meaning to send for a couple of days. I realized after sending the last round that not only was the first commit from v1 flawed (for the reasons Patrick identified) but that there is currently no way to grow a new cruft pack past the configured limit. Independent of this series suppose for example that we have two 100 MiB packs, and the threshold is 200 MiB. We should able to in theory combine those packs together. But we can't! The largest pack we'll make is 199MiB (and change), since builtin/pack-objects.c::write_one() will refuse to write any object which would bust the limit given by --max-pack-size. This series resurrects the first patch from v1 after introducing a behavior change for 'git pack-objects --cruft --max-pack-size'. When given with '--cruft', '--max-pack-size' now allows pack-objects to grow a pack *just* past the given limit by at most one object. This allows packs to grow past their threshold and age out of the active generation of cruft packs so they are no longer repacked with each 'git repack --cruft'. We're way too late into the -rc cycle for this to land in the forthcoming release, but I wanted to get this off of my workstation anyway to allow folks to review it as they have time. As usual, there is a range-diff since last time. Thanks in advance for your review! Taylor Blau (6): t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests t7704-repack-cruft.sh: consolidate `write_blob()` t/lib-cruft.sh: extract some cruft-related helpers pack-objects: generate cruft packs at most one object over threshold builtin/repack.c: simplify cruft pack aggregation builtin/pack-objects.c: freshen objects from existing cruft packs Documentation/config/pack.adoc | 4 + Documentation/git-pack-objects.adoc | 4 + builtin/pack-objects.c | 150 +++++++++-- builtin/repack.c | 38 +-- packfile.c | 3 +- packfile.h | 2 + t/lib-cruft.sh | 23 ++ t/t5329-pack-objects-cruft.sh | 317 +++++------------------- t/t7704-repack-cruft.sh | 372 +++++++++++++++++++++++----- 9 files changed, 544 insertions(+), 369 deletions(-) create mode 100644 t/lib-cruft.sh Range-diff against v3: -: ---------- > 1: 390c3a6d85 t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests -: ---------- > 2: e7ebe6c460 t7704-repack-cruft.sh: consolidate `write_blob()` -: ---------- > 3: aa7588f817 t/lib-cruft.sh: extract some cruft-related helpers -: ---------- > 4: f2ca92245a pack-objects: generate cruft packs at most one object over threshold -: ---------- > 5: 12ddea7603 builtin/repack.c: simplify cruft pack aggregation 1: c80188164e = 6: d44a124c81 builtin/pack-objects.c: freshen objects from existing cruft packs base-commit: 87a0bdbf0f72b7561f3cd50636eee33dcb7dbcc3 -- 2.49.0.rc2.6.g9a1eecd400
