Re: [PATCH v2 0/9] pack-bitmap: fix various pseudo-merge bugs
- From
Elijah Newren <newren@gmail.com>
- Date
- Apr 22, 2026, 01:37 UTC
- Message-ID
- <CABPp-BGkfavqezk2SV3+K6iF8MLm8j_=ijHiPDLmv_U_o_Ykgg@mail.gmail.com>
- In-Reply-To
- <cover.1776801694.git.me@ttaylorr.com>
On Tue, Apr 21, 2026 at 1:01 PM Taylor Blau <me@ttaylorr.com> wrote:
Show 18 quoted lines
> > [Note to the maintainer: this series has been rebased onto the current > tip of master, which is 94f057755b7 (Git 2.54, 2026-04-19) at the time > of writing.] > > This is a small reroll of my series to fix several bugs in the > pseudo-merge bitmap implementation. The main changes since last time > are: > > - Fixed a use-after-realloc bug in the test helper introduced in the > first commit. > > - Swapped the order of initializing and cleaning up repositories in the > new test scripts. > > - Updated bitmapPseudoMerge.<name>.sampleRate's documentation to > describe the range as (0,1], and added a new commit fixing a broken > example in gitpacking(7).
Thanks for fixing these.
> Range-diff against v1:
[...]
Show 8 quoted lines
> 4: af9f651269d ! 4: 07f70a07c20 pack-bitmap: fix inverted binary search in `pseudo_merge_at()` > @@ t/t5333-pseudo-merge-bitmaps.sh: test_expect_success 'apply pseudo-merges during > > -test_expect_failure 'apply pseudo-merges from multiple groups during fill-in' ' > +test_expect_success 'apply pseudo-merges from multiple groups during fill-in' ' > - git init pseudo-merge-fill-in-multi && > test_when_finished "rm -fr pseudo-merge-fill-in-multi" && > + git init pseudo-merge-fill-in-multi &&
Here you fixed the order, but...
> ++ git init pseudo-merge-fill-in-multi &&
...then you immediately run git init a second time? I'm guessing this was a stray edit made while trying to fix the order; could we get rid of the duplicate?
> ( > + cd pseudo-merge-fill-in-multi && > +
Looks like you addressed all the feedback so far from v1. There does appear to be a new accidental double-init that I noted above in patch 4, but I didn't spot any other issues.