From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Jan 2026 07:40:32 +0000 (+0900)
Subject: Merge branch 'ps/packfile-store-in-odb-source' into jch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e5dec2ba52bdf78b2cbd397f41012af6fb5985;p=thirdparty%2Fgit.git

Merge branch 'ps/packfile-store-in-odb-source' into jch

The packfile_store data structure is moved from object store to odb
source.

* ps/packfile-store-in-odb-source:
  packfile: move MIDX into packfile store
  packfile: refactor `find_pack_entry()` to work on the packfile store
  packfile: inline `find_kept_pack_entry()`
  packfile: only prepare owning store in `packfile_store_prepare()`
  packfile: only prepare owning store in `packfile_store_get_packs()`
  packfile: move packfile store into object source
  packfile: refactor misleading code when unusing pack windows
  packfile: refactor kept-pack cache to work with packfile stores
  packfile: pass source to `prepare_pack()`
  packfile: create store via its owning source
---

11e5dec2ba52bdf78b2cbd397f41012af6fb5985
diff --cc packfile.c
index 23a7f8a191,097dd8d85d..3ffd6c7240
--- a/packfile.c
+++ b/packfile.c
@@@ -2148,10 -2143,10 +2142,10 @@@ int packfile_store_read_object_info(str
  	 * We know that the caller doesn't actually need the
  	 * information below, so return early.
  	 */
 -	if (oi == &blank_oi)
 +	if (!oi)
  		return 0;
  
- 	rtype = packed_object_info(store->odb->repo, e.p, e.offset, oi);
+ 	rtype = packed_object_info(store->source->odb->repo, e.p, e.offset, oi);
  	if (rtype < 0) {
  		mark_bad_packed_object(e.p, oid);
  		return -1;