pack-bitmap: fix inverted binary search in `pseudo_merge_at()`

The binary search in `pseudo_merge_at()` has its "lo" and "hi" updates swapped: when the midpoint's offset is less than the target, it sets `hi = mi` (searching left) instead of `lo = mi + 1` (searching right), and vice versa. This means that lookups for pseudo-merges whose offset is not near the midpoint of the pseudo-merge table are likely to fail. In practice, with a single pseudo-merge group this is masked because the lone entry is always at the midpoint. With multiple groups, the inverted comparisons cause lookups to search in the wrong direction, potentially missing entries. Swap the "lo" and "hi" assignments to search in the correct direction, making it possible to apply pseudo-merges during fill-in when more than one pseudo-merge exists in a group. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed May 11, 2026 at 20:46 UTC b1e3fcdb9b087b4d69836dd5a228648008ff419a
2 files changed +3 -3
pseudo-merge.c
+2 -2
@@ -559,9 +559,9 @@ static struct pseudo_merge *pseudo_merge_at(const struct pseudo_merge_map *pm,
559 if (got == want)
560 return use_pseudo_merge(pm, &pm->v[mi]);
561 else if (got < want)
562 - hi = mi;
563 - else
562 lo = mi + 1;
563 + else
564 + hi = mi;
565 }
566
567 warning(_("could not find pseudo-merge for commit %s at offset %"PRIuMAX),
t/t5333-pseudo-merge-bitmaps.sh
+1 -1
@@ -496,7 +496,7 @@ test_expect_success 'apply pseudo-merges during fill-in traversal' '
496 )
497 '
498
499 -test_expect_failure 'apply pseudo-merges from multiple groups during fill-in' '
499 +test_expect_success 'apply pseudo-merges from multiple groups during fill-in' '
500 test_when_finished "rm -fr pseudo-merge-fill-in-multi" &&
501 git init pseudo-merge-fill-in-multi &&
502 (