From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Sep 2025 16:31:08 +0000 (-0700)
Subject: Merge branch 'ps/packfile-store' into tb/incremental-midx-part-3.1
X-Git-Tag: v2.52.0-rc0~16^2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9fab7ec7ff80707e703f16636200be8bbde204ca;p=thirdparty%2Fgit.git

Merge branch 'ps/packfile-store' into tb/incremental-midx-part-3.1

* ps/packfile-store:
  packfile: refactor `get_packed_git_mru()` to work on packfile store
  packfile: refactor `get_all_packs()` to work on packfile store
  packfile: refactor `get_packed_git()` to work on packfile store
  packfile: move `get_multi_pack_index()` into "midx.c"
  packfile: introduce function to load and add packfiles
  packfile: refactor `install_packed_git()` to work on packfile store
  packfile: split up responsibilities of `reprepare_packed_git()`
  packfile: refactor `prepare_packed_git()` to work on packfile store
  packfile: reorder functions to avoid function declaration
  odb: move kept cache into `struct packfile_store`
  odb: move MRU list of packfiles into `struct packfile_store`
  odb: move packfile map into `struct packfile_store`
  odb: move initialization bit into `struct packfile_store`
  odb: move list of packfiles into `struct packfile_store`
  packfile: introduce a new `struct packfile_store`
---

9fab7ec7ff80707e703f16636200be8bbde204ca
diff --cc bulk-checkin.c
index 124c493067,f65439a748..2713a00999
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@@ -95,7 -90,7 +95,7 @@@ clear_exit
  
  	strbuf_release(&packname);
  	/* Make objects we just wrote available to ourselves */
- 	reprepare_packed_git(repo);
 -	odb_reprepare(the_repository->objects);
++	odb_reprepare(repo->objects);
  }
  
  /*
diff --cc odb.h
index bd7374f92f,ab39e3605d..cf96a5e834
--- a/odb.h
+++ b/odb.h
@@@ -91,8 -90,8 +90,9 @@@ struct odb_source 
  };
  
  struct packed_git;
+ struct packfile_store;
  struct cached_object_entry;
 +struct odb_transaction;
  
  /*
   * The object database encapsulates access to objects in a repository. It