]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/packfile-store' into tb/incremental-midx-part-3.1
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2025 16:31:08 +0000 (09:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Sep 2025 16:31:08 +0000 (09:31 -0700)
* 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`

1  2 
bulk-checkin.c
http.c
object-name.c
odb.h

diff --cc bulk-checkin.c
index 124c49306769a5bc0fa568dc606ce5eb7370bf7e,f65439a748a4ece5371b244008d135e7ae809f5d..2713a0099966c3b1762b76ecb2e768207b93a980
@@@ -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 http.c
Simple merge
diff --cc object-name.c
Simple merge
diff --cc odb.h
index bd7374f92f492b6e0b75178e04f8b65b336acf00,ab39e3605d541997d8b12fbf14bc9e78def515a5..cf96a5e834e096c3e545615c833a064d6e8c96f0
--- 1/odb.h
--- 2/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