From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Oct 2025 19:38:24 +0000 (-0700)
Subject: Merge branch 'tb/incremental-midx-part-3.1'
X-Git-Tag: v2.52.0-rc0~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1b23bd8aaa3856695e0361f52f1a44301d1c317;p=thirdparty%2Fgit.git

Merge branch 'tb/incremental-midx-part-3.1'

Clean-up "git repack" machinery to prepare for incremental update
of midx files.

* tb/incremental-midx-part-3.1: (49 commits)
  builtin/repack.c: clean up unused `#include`s
  repack: move `write_cruft_pack()` out of the builtin
  repack: move `write_filtered_pack()` out of the builtin
  repack: move `pack_kept_objects` to `struct pack_objects_args`
  repack: move `finish_pack_objects_cmd()` out of the builtin
  builtin/repack.c: pass `write_pack_opts` to `finish_pack_objects_cmd()`
  repack: extract `write_pack_opts_is_local()`
  repack: move `find_pack_prefix()` out of the builtin
  builtin/repack.c: use `write_pack_opts` within `write_cruft_pack()`
  builtin/repack.c: introduce `struct write_pack_opts`
  repack: 'write_midx_included_packs' API from the builtin
  builtin/repack.c: inline packs within `write_midx_included_packs()`
  builtin/repack.c: pass `repack_write_midx_opts` to `midx_included_packs`
  builtin/repack.c: inline `remove_redundant_bitmaps()`
  builtin/repack.c: reorder `remove_redundant_bitmaps()`
  repack: keep track of MIDX pack names using existing_packs
  builtin/repack.c: use a string_list for 'midx_pack_names'
  builtin/repack.c: extract opts struct for 'write_midx_included_packs()'
  builtin/repack.c: remove ref snapshotting from builtin
  repack: remove pack_geometry API from the builtin
  ...
---

c1b23bd8aaa3856695e0361f52f1a44301d1c317
diff --cc Makefile
index 562e637fa0,e3c4bf1b4a..7e0f77e298
--- a/Makefile
+++ b/Makefile
@@@ -1252,21 -1135,13 +1252,27 @@@ LIB_OBJS += refs/iterator.
  LIB_OBJS += refs/packed-backend.o
  LIB_OBJS += refs/ref-cache.o
  LIB_OBJS += refspec.o
 +LIB_OBJS += reftable/basics.o
 +LIB_OBJS += reftable/block.o
 +LIB_OBJS += reftable/blocksource.o
 +LIB_OBJS += reftable/error.o
 +LIB_OBJS += reftable/fsck.o
 +LIB_OBJS += reftable/iter.o
 +LIB_OBJS += reftable/merged.o
 +LIB_OBJS += reftable/pq.o
 +LIB_OBJS += reftable/record.o
 +LIB_OBJS += reftable/stack.o
 +LIB_OBJS += reftable/system.o
 +LIB_OBJS += reftable/table.o
 +LIB_OBJS += reftable/tree.o
 +LIB_OBJS += reftable/writer.o
  LIB_OBJS += remote.o
+ LIB_OBJS += repack.o
+ LIB_OBJS += repack-cruft.o
+ LIB_OBJS += repack-filtered.o
+ LIB_OBJS += repack-geometry.o
+ LIB_OBJS += repack-midx.o
+ LIB_OBJS += repack-promisor.o
  LIB_OBJS += replace-object.o
  LIB_OBJS += repo-settings.o
  LIB_OBJS += repository.o