Re: What's cooking in git.git (Sep 2025, #09; Mon, 22)

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Sep 24, 2025, 06:44 UTC
Message-ID: <aNOTMtVC0ArCSTRS@szeder.dev>
In-Reply-To: <xmqqldm6qehe.fsf@gitster.g>

Show 15 quoted lines

> * jt/odb-transaction (2025-09-16) 7 commits
>  - odb: add transaction interface
>  - object-file: update naming from bulk-checkin
>  - object-file: relocate ODB transaction code
>  - bulk-checkin: drop flush_odb_transaction()
>  - builtin/update-index: end ODB transaction when --verbose is specified
>  - bulk-checkin: remove ODB transaction nesting
>  - Merge branch 'jt/de-global-bulk-checkin' into jt/odb-transaction
> 
>  Continue the work to build on the bulk-checkin infrastructure to
>  create many objects at once in a transaction and abstract it into
>  the generic object layer.
> 
>  Will merge to 'next'.
>  source: <20250916182938.2193476-1-jltobler@gmail.com>

The merge of this topic into 'jch' modifies 'object-file.c' by replacing a call to reprepare_packed_git() with odb_reprepare(), but at that point the latter function doesn't exists yet, as it will only be introduced in 'ps/packfile-store', which is merged later.

Interestingly, when I tried to recreate the same merge I got a conflict only in 'odb.h', but not in 'object-file.c'.

Show 24 quoted lines

> * ps/packfile-store (2025-09-15) 16 commits
>  - 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`
>  - Merge branch 'ps/object-store-midx-dedup-info' into ps/packfile-store
> 
>  Code clean-up around the in-core list of all the pack files and
>  object database(s).
> 
>  Expecting a reroll.
>  cf. <aMe_Zu1osrfDnSYL@pks.im>
>  source: <20250915-b4-pks-packfiles-store-v5-0-d6340350934f@pks.im>