]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/multi-pack-reuse-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Sep 2024 18:47:23 +0000 (11:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Sep 2024 18:47:23 +0000 (11:47 -0700)
A data corruption bug when multi-pack-index is used and the same
objects are stored in multiple packfiles has been corrected.

* tb/multi-pack-reuse-fix:
  builtin/pack-objects.c: do not open-code `MAX_PACK_OBJECT_HEADER`
  pack-bitmap.c: avoid repeated `pack_pos_to_offset()` during reuse
  builtin/pack-objects.c: translate bit positions during pack-reuse
  pack-bitmap: tag bitmapped packs with their corresponding MIDX
  t/t5332-multi-pack-reuse.sh: verify pack generation with --strict


Trivial merge