pack-objects: more brown-paper-bag multi-pack reuse fixes
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest2 patches 2 repliesIn review
- v12 patches 6 repliesSuperseded
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/2 | t5332-multi-pack-reuse.sh: demonstrate duplicate packing failuret/ | +22 | 0 replies | |
| 2/2 | pack-objects: only perform verbatim reuse on the preferred packbuiltin/ t/ | +44 | 2 replies |
Reviews trailers per patch
None of the 2 patches has a Reviewed-by or Acked-by.
| Patch | Jeff King |
|---|---|
| 1/2 | Helped-by |
| 2/2 | Helped-by |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 0/2] pack-objects: more brown-paper-bag multi-pack reuse fixes
This is a small re-roll of my series to fix a regression in multi-pack reuse based on a broken assumption in write_reused_pack_verbatim().
The only change since last time is removing a stray debugging aid, and the series is otherwise identical as in v1. A range-diff is included below for convenience.
Thanks in advance for your review!
Taylor Blau (2):
t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
pack-objects: only perform verbatim reuse on the preferred pack
builtin/pack-objects.c | 101 +++++++++++++++--------------------- t/t5332-multi-pack-reuse.sh | 22 ++++++++ 2 files changed, 65 insertions(+), 58 deletions(-)
Range-diff against v1:
1: 7a69cf84ae5 ! 1: d791b7b20c9 t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
@@ t/t5332-multi-pack-reuse.sh: test_expect_success 'duplicate objects' '
+
+ # ...and create a separate pack containing just that object
+ p="$(git pack-objects $packdir/pack <in)" &&
-+ git show-index <$packdir/pack-$p.idx &&
+
+ git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+2: 2520abf24a8 = 2: d73b8fe2d63 pack-objects: only perform verbatim reuse on the preferred pack
base-commit: 25b0f41288718625b18495de23cc066394c09a92
Signature · 1 line
2.46.0.421.g159f2d50e75