]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tb/pseudo-merge-bugfixes' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2026 01:00:18 +0000 (10:00 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2026 01:00:18 +0000 (10:00 +0900)
commitecee155d5c3687d0cfc929e6e761732d3da86b25
tree496fe70e288039f0a98636b6cb85a5aad2522907
parent3ed373ac14709745ea457f6c3c005a959506b723
parent5e6e8dc7860374d79bad3e2a3ade0c2d391bbad6
Merge branch 'tb/pseudo-merge-bugfixes' into next

Fixes many bugs in pseudo-merge code.

* tb/pseudo-merge-bugfixes:
  pack-bitmap: prevent pattern leak on pseudo-merge re-assignment
  Documentation: fix broken `sampleRate` in gitpacking(7)
  pack-bitmap: reject pseudo-merge "sampleRate" of 0
  pack-bitmap: parse commits in `find_pseudo_merge_group_for_ref()`
  pack-bitmap: fix pseudo-merge lookup for shared commits
  pack-bitmap: fix inverted binary search in `pseudo_merge_at()`
  pack-bitmap-write: sort pseudo-merge commit lookup table in pack order
  t5333: demonstrate various pseudo-merge bugs
  t/helper: add 'test-tool bitmap write' subcommand