From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Apr 2023 20:56:20 +0000 (-0700)
Subject: Merge branch 'ps/fix-geom-repack-with-alternates'
X-Git-Tag: v2.41.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5;p=thirdparty%2Fgit.git

Merge branch 'ps/fix-geom-repack-with-alternates'

Geometric repacking ("git repack --geometric=<n>") in a repository
that borrows from an alternate object database had various corner
case bugs, which have been corrected.

* ps/fix-geom-repack-with-alternates:
  repack: disable writing bitmaps when doing a local repack
  repack: honor `-l` when calculating pack geometry
  t/helper: allow chmtime to print verbosely without modifying mtime
  pack-objects: extend test coverage of `--stdin-packs` with alternates
  pack-objects: fix error when same packfile is included and excluded
  pack-objects: fix error when packing same pack twice
  pack-objects: split out `--stdin-packs` tests into separate file
  repack: fix generating multi-pack-index with only non-local packs
  repack: fix trying to use preferred pack in alternates
  midx: fix segfault with no packs and invalid preferred pack
---

36628c56ed54b5a86aa9a17ed589fc0ee7f5bea5