From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Oct 2025 22:04:29 +0000 (-0700)
Subject: Merge branch 'tb/incremental-midx-part-3.1' into seen
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b359d264c9664fc8f85bb77b9a55034750f61814;p=thirdparty%2Fgit.git

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

* tb/incremental-midx-part-3.1: (50 commits)
  SQUASH??? play well with other topics by preemptively including "repository.h"
  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
  ...
---

b359d264c9664fc8f85bb77b9a55034750f61814
diff --cc Makefile
index c10b238084,e3c4bf1b4a..e215d9690e
--- a/Makefile
+++ b/Makefile
@@@ -1249,8 -1136,13 +1249,14 @@@ LIB_OBJS += refs/packed-backend.
  LIB_OBJS += refs/ref-cache.o
  LIB_OBJS += refspec.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 += replay.o
  LIB_OBJS += repo-settings.o
  LIB_OBJS += repository.o
  LIB_OBJS += rerere.o
diff --cc meson.build
index d9f22ea56d,39152b37ba..e3c0477048
--- a/meson.build
+++ b/meson.build
@@@ -463,8 -462,13 +463,14 @@@ libgit_sources = 
    'reftable/tree.c',
    'reftable/writer.c',
    'remote.c',
+   'repack.c',
+   'repack-cruft.c',
+   'repack-filtered.c',
+   'repack-geometry.c',
+   'repack-midx.c',
+   'repack-promisor.c',
    'replace-object.c',
 +  'replay.c',
    'repo-settings.c',
    'repository.c',
    'rerere.c',