From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Sep 2022 01:33:39 +0000 (-0700)
Subject: Merge branch 'tb/midx-with-changing-preferred-pack-fix'
X-Git-Tag: v2.38.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf98b69053996728f131671ed7ff9581b0e8943a;p=thirdparty%2Fgit.git

Merge branch 'tb/midx-with-changing-preferred-pack-fix'

Multi-pack index got corrupted when preferred pack changed from one
pack to another in a certain way, which has been corrected.

* tb/midx-with-changing-preferred-pack-fix:
  midx.c: avoid adding preferred objects twice
  midx.c: include preferred pack correctly with existing MIDX
  midx.c: extract `midx_fanout_add_pack_fanout()`
  midx.c: extract `midx_fanout_add_midx_fanout()`
  midx.c: extract `struct midx_fanout`
  t/lib-bitmap.sh: avoid silencing stderr
  t5326: demonstrate potential bitmap corruption
---

cf98b69053996728f131671ed7ff9581b0e8943a