]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/fix-geom-repack-with-alternates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 20:56:20 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Apr 2023 20:56:20 +0000 (13:56 -0700)
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

1  2 
builtin/pack-objects.c
builtin/repack.c
midx.c
object-file.c
object-store.h

Simple merge
Simple merge
diff --cc midx.c
Simple merge
diff --cc object-file.c
Simple merge
diff --cc object-store.h
Simple merge