What's cooking in git.git (Nov 2025, #03; Fri, 7)

What's cooking in git.git (Nov 2025, #03; Fri, 7)

[Junio C Hamano]

Here are the topics that have been cooking in my tree.  Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a
future release).  Commits prefixed with '-' are only in 'seen', and
aren't considered "accepted" at all and may be annotated with an URL
to a message that raises issues but they are no means exhaustive.  A
topic without enough support may be discarded after a long period of
no activity (of course they can be resubmit when new interests
arise).

Git 2.52-rc1 has been tagged.  Hopefully we can have a reasonably
solid Git 2.52 in the middle of this month.  Until then let's
concentrate on finding and fixing regressions introduced during this
cycle, if any.

Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into or their mirrors.  Some
repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-scm/git/

With all the integration branches and topics broken out:

	https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

	https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[Graduated to 'master']

* cc/fast-import-export-i18n-cleanup (2025-10-30) 5 commits
  (merged to 'next' on 2025-11-03 at 41a35c3e52)
 + gpg-interface: mark a string for translation
 + fast-import: mark strings for translation
 + fast-export: mark strings for translation
 + gpg-interface: use left shift to define GPG_VERIFY_*
 + gpg-interface: simplify ssh fingerprint parsing

 Messages from fast-import/export are now marked for i18n.
 source: <20251030123332.3337684-1-christian.couder@gmail.com>


* dk/parseopt-optional-filename-fixes (2025-11-04) 6 commits
  (merged to 'next' on 2025-11-04 at 1cb7573414)
 + parseopt: remove unreachable code
 + parseopt: restore const qualifier to parsed filename
 + config: use boolean type for a simple flag
 + parseopt: use boolean type for a simple flag
 + doc: clarify command equivalence comment
 + parseopt: fix :(optional) at command line to only ignore missing files

 A recently added configuration variable and command line option
 syntax ":(optional)" for values that are of filename type
 inconsistently behaved on an empty file (configuration took it
 happily, while the command line option pretended as if it did not
 exist), which has been corrected.
 source: <cover.1762100242.git.ben.knoble+github@gmail.com>
 source: <xmqq1pmdr9qu.fsf@gitster.g>


* js/ci-github-actions-update (2025-11-06) 1 commit
  (merged to 'next' on 2025-11-06 at 68957de207)
 + ci: update {download,upload}-artifact Action versions

 CI updates.
 source: <pull.1996.git.1762437576488.gitgitgadget@gmail.com>


* pk/reflog-migrate-message-fix (2025-11-05) 1 commit
  (merged to 'next' on 2025-11-06 at c9c574a496)
 + refs: add missing space in messages

 Message fix.
 source: <a8220721-3260-15cb-6960-ca8b6433d7b5@softwolves.pp.se>

--------------------------------------------------
[New Topics]

* lc/rebase-trailer (2025-11-05) 4 commits
 - rebase: support --trailer
 - trailer: append trailers in-process and drop the fork to `interpret-trailers`
 - trailer: move process_trailers to trailer.h
 - interpret-trailers: factor out buffer-based processing to process_trailers()

 Refactor code paths to run "interpret-trailers" from "git
 commit/tag" and use it in "git rebase".

 Comments?
 source: <20251105142944.73061-1-me@linux.beauty>


* ps/ref-peeled-tags-fixes (2025-11-06) 2 commits
 - object: fix performance regression when peeling tags
 - Merge branch 'ps/ref-peeled-tags' into ps/ref-peeled-tags-fixes
 (this branch uses ps/ref-peeled-tags.)

 Another fix-up to "peeled-tags" topic.

 Will merge to 'next'.
 source: <20251106-b4-pks-peel-object-performance-regression-v1-1-a386147750b0@pks.im>


* tu/credential-wincred-makefile-update (2025-11-05) 1 commit
  (merged to 'next' on 2025-11-07 at ed74befe91)
 + wincred: align Makefile with other Makefiles in contrib

 Build procedure for Wincred credential helper has been updated.

 Will cook in 'next'.
 source: <3869ec21-e20d-cf9b-5913-6389c372a5f0@mailbox.tu-dresden.de>

--------------------------------------------------
[Cooking]

* en/ort-rename-another-fix (2025-11-03) 3 commits
 - merge-ort: fix failing merges in special corner case
 - merge-ort: remove debugging crud
 - t6429: update comment to mention correct tool

 Yet another corner case fix around renames in the "ort" merge
 strategy.

 Will merge to 'next'?
 source: <pull.1992.git.1762192908.gitgitgadget@gmail.com>


* dk/make-git-contacts-executable (2025-11-04) 1 commit
  (merged to 'next' on 2025-11-07 at 30608eb744)
 + perl: also mark git-contacts executable

 Building "git contacts" script (in contrib/) leaves the resulting
 file unexecutable, which has been corrected.

 Will cook in 'next'.
 source: <7fbb341e8f05fcde3a1543e3bb4e5a3ec1101692.1762280097.git.ben.knoble+github@gmail.com>


* dk/meson-html-dir (2025-11-04) 1 commit
  (merged to 'next' on 2025-11-07 at b30cf1f060)
 + meson: make GIT_HTML_PATH configurable

 The build procedure based on meson learned to allow builders to
 specify the directory to install HTML documents.

 Will cook in 'next'.
 source: <385992f6020703558f0ba75a1be6c4f9dae08b83.1762264709.git.ben.knoble+github@gmail.com>


* kn/maintenance-is-needed (2025-11-06) 7 commits
 - maintenance: add 'is-needed' subcommand
 - maintenance: add checking logic in `pack_refs_condition()`
 - refs: add a `optimize_required` field to `struct ref_storage_be`
 - reftable/stack: add function to check if optimization is required
 - reftable/stack: return stack segments directly
 - Merge branch 'kn/refs-optim-cleanup' into kn/maintenance-is-needed
 - Merge branch 'ps/ref-peeled-tags' into kn/maintenance-is-needed
 (this branch uses kn/refs-optim-cleanup and ps/ref-peeled-tags.)

 "git maintenance" command learned "is-needed" subcommand to tell if
 it is necessary to perform various maintenance tasks.

 Will merge to 'next'?
 source: <20251106-562-add-sub-command-to-check-if-maintenance-is-needed-v3-0-d611a2a95cf5@gmail.com>


* qj/doc-http-bad-want-response (2025-11-05) 1 commit
 - doc: clarify server behavior for invalid 'want' lines in HTTP protocol

 Doc update.

 Will merge to 'next'?
 source: <20251105143849.1192-1-qjessa662@gmail.com>


* jc/exclude-with-gitignore (2025-11-04) 1 commit
 - dir.c: do not be fooled by :(exclude) pathspec elements

 "git add ':(exclude)foo.o'" is clearly a request not to add 'foo.o',
 but the command complained about listing an ignored path foo.o on
 the command line, which has been corrected.

 Comments?
 source: <xmqqtsz9o3cn.fsf@gitster.g>


* cc/fast-import-strip-if-invalid (2025-11-04) 3 commits
 - fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
 - commit: refactor verify_commit_buffer()
 - fast-import: refactor finalize_commit_buffer()

 "git fast-import" learns "--strip-if-invalid" option to drop
 invalid cryptographic signature from objects.

 Comments?
 source: <20251105061918.3688870-1-christian.couder@gmail.com>


* jc/whitespace-incomplete-line (2025-11-05) 12 commits
 - attr: enable incomplete-line whitespace error for this project
 - diff: highlight and error out on incomplete lines
 - apply: check and fix incomplete lines
 - whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE
 - apply: revamp the parsing of incomplete lines
 - diff: update the way rewrite diff handles incomplete lines
 - diff: call emit_callback ecbdata everywhere
 - diff: refactor output of incomplete line
 - diff: fix incorrect counting of line numbers
 - diff: correct suppress_blank_empty hack
 - diff: emit_line_ws_markup() if/else style fix
 - whitespace: correct bit assignment comments

 Both "git apply" and "git diff" learn a new whitespace error class,
 "incomplete-line".

 Comments?
 source: <20251105213052.1499224-1-gitster@pobox.com>


* tc/last-modified-active-paths-optimization (2025-10-23) 1 commit
  (merged to 'next' on 2025-11-03 at 9ab444edfb)
 + last-modified: implement faster algorithm

 "git last-modified" was optimized by narrowing the set of paths to
 follow as it dug deeper in the history.

 Will cook in 'next'.
 source: <20251023-b4-toon-last-modified-faster-v3-1-40a4ddbbadec@iotcl.com>


* ps/object-source-loose (2025-11-02) 13 commits
 - object-file: refactor writing objects via a stream
 - object-file: rename `write_object_file()`
 - object-file: refactor freshening of objects
 - object-file: rename `has_loose_object()`
 - object-file: read objects via the loose object source
 - object-file: move loose object map into loose source
 - object-file: hide internals when we need to reprepare loose sources
 - object-file: move loose object cache into loose source
 - object-file: introduce `struct odb_source_loose`
 - object-file: move `fetch_if_missing`
 - odb: adjust naming to free object sources
 - odb: introduce `odb_source_new()`
 - odb: fix subtle logic to check whether an alternate is usable

 A part of code paths that deals with loose objects has been cleaned
 up.

 Will merge to 'next'?
 source: <20251103-b4-pks-odb-loose-backend-v3-0-6a61ea977393@pks.im>


* bc/sha1-256-interop-02 (2025-10-29) 15 commits
 - SQUASH??? downgrade build.rs syntax
 - object-file-convert: always make sure object ID algo is valid
 - rust: add a small wrapper around the hashfile code
 - rust: add a new binary loose object map format
 - rust: add functionality to hash an object
 - rust: add a build.rs script for tests
 - hash: expose hash context functions to Rust
 - write-or-die: add an fsync component for the loose object map
 - csum-file: define hashwrite's count as a uint32_t
 - hash: add a function to look up hash algo structs
 - rust: add a hash algorithm abstraction
 - rust: add a ObjectID struct
 - hash: use uint32_t for object_id algorithm
 - conversion: don't crash when no destination algo
 - repository: require Rust support for interoperability

 The code to maintain mapping between object names in multiple hash
 functions is being added, written in Rust.

 Expecting a reroll.
 source: <20251027004404.2152927-1-sandals@crustytoothpaste.net>


* ad/blame-diff-algorithm (2025-11-06) 2 commits
 - blame: make diff algorithm configurable
 - xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK

 "git blame" learns "--diff-algorithm=<algo>" option.

 Will merge to 'next'?
 source: <pull.2075.v5.git.git.1762468914.gitgitgadget@gmail.com>


* ps/packed-git-in-object-store (2025-10-30) 9 commits
  (merged to 'next' on 2025-11-03 at 1eb3440abd)
 + packfile: track packs via the MRU list exclusively
 + packfile: always add packfiles to MRU when adding a pack
 + packfile: move list of packs into the packfile store
 + builtin/pack-objects: simplify logic to find kept or nonlocal objects
 + packfile: fix approximation of object counts
 + http: refactor subsystem to use `packfile_list`s
 + packfile: move the MRU list into the packfile store
 + packfile: use a `strmap` to store packs by name
 + Merge branch 'ps/remove-packfile-store-get-packs' into ps/packed-git-in-object-store

 The list of packfiles used in a running Git process is moved from
 the packed_git structure into the packfile store.

 Will cook in 'next'.
 source: <20251030-pks-packfiles-store-drop-list-v2-0-84654f080cc0@pks.im>


* kn/refs-optim-cleanup (2025-10-20) 4 commits
  (merged to 'next' on 2025-11-04 at dbab18969a)
 + t/pack-refs-tests: move the 'test_done' to callees
 + refs: rename 'pack_refs_opts' to 'refs_optimize_opts'
 + refs: move to using the '.optimize' functions
 + Merge branch 'ps/ref-peeled-tags' into kn/refs-optim-cleanup
 (this branch is used by kn/maintenance-is-needed; uses ps/ref-peeled-tags.)

 Code clean-up.

 Will cook in 'next'.
 source: <20251020-refs-code-cleanup-v2-0-f5349ed0f6a5@gmail.com>


* lo/repo-info-all (2025-10-26) 2 commits
 - repo: add --all to git-repo-info
 - repo: factor out field printing to dedicated function

 "git repo info" learned "--all" option.

 Expecting a (hopefully small and final) reroll.
 cf. <xmqqpla43wcp.fsf@gitster.g> <aQRaRuBtt_r7SamL@pks.im>
 source: <20251026225409.46647-1-lucasseikioshiro@gmail.com>


* en/xdiff-cleanup-2 (2025-10-29) 10 commits
 - xdiff: rename rindex -> reference_index
 - xdiff: change rindex from long to size_t in xdfile_t
 - xdiff: make xdfile_t.nreff a size_t instead of long
 - xdiff: make xdfile_t.nrec a size_t instead of long
 - xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hash
 - xdiff: use unambiguous types in xdl_hash_record()
 - xdiff: use size_t for xrecord_t.size
 - xdiff: make xrecord_t.ptr a uint8_t instead of char
 - xdiff: use ssize_t for dstart/dend, make them last in xdfile_t
 - doc: define unambiguous type mappings across C and Rust

 Code clean-up.

 Comments?
 source: <pull.2070.v2.git.git.1761776388.gitgitgadget@gmail.com>


* ar/run-command-hook (2025-10-17) 10 commits
 - receive-pack: convert receive hooks to hook API
 - receive-pack: convert update hooks to new API
 - hooks: allow callers to capture output
 - run-command: allow capturing of collated output
 - reference-transaction: use hook API instead of run-command
 - hook: allow overriding the ungroup option
 - transport: convert pre-push to hook API
 - hook: convert 'post-rewrite' hook in sequencer.c to hook API
 - hook: provide stdin via callback
 - run-command: add stdin callback for parallelization

 Use hook API to replace ad-hoc invocation of hook scripts with the
 run_command() API.

 Comments?
 source: <20251017141544.1538542-1-adrian.ratiu@collabora.com>


* je/doc-reset (2025-10-17) 4 commits
 - doc: git-reset: clarify `git reset <pathspec>`
 - doc: git-reset: clarify `git reset [mode]`
 - doc: git-reset: clarify intro
 - doc: git-reset: reorder the forms

 Documentation updates.

 Expecting a reroll.
 cf. <8099e7ef-2673-407e-8cca-e6b566b99549@app.fastmail.com>
 source: <pull.1991.git.1760731558.gitgitgadget@gmail.com>


* ps/ref-peeled-tags (2025-11-04) 18 commits
  (merged to 'next' on 2025-11-04 at 3818774c94)
 + t7004: do not chdir around in the main process
 + ref-filter: fix stale parsed objects
 + ref-filter: parse objects on demand
 + ref-filter: detect broken tags when dereferencing them
 + refs: don't store peeled object IDs for invalid tags
 + object: add flag to `peel_object()` to verify object type
 + refs: drop infrastructure to peel via iterators
 + refs: drop `current_ref_iter` hack
 + builtin/show-ref: convert to use `reference_get_peeled_oid()`
 + ref-filter: propagate peeled object ID
 + upload-pack: convert to use `reference_get_peeled_oid()`
 + refs: expose peeled object ID via the iterator
 + refs: refactor reference status flags
 + refs: fully reset `struct ref_iterator::ref` on iteration
 + refs: introduce `.ref` field for the base iterator
 + refs: introduce wrapper struct for `each_ref_fn`
 + Merge branch 'jt/repo-structure' into ps/ref-peeled-tags
 + Merge branch 'tb/incremental-midx-part-3.1' into ps/ref-peeled-tags
 (this branch is used by kn/maintenance-is-needed, kn/refs-optim-cleanup and ps/ref-peeled-tags-fixes.)

 Some ref backend storage can hold not just the object name of an
 annotated tag, but the object name of the object the tag points at.
 The code to handle this information has been streamlined.

 Will cook in 'next'.
 source: <20251023-b4-pks-ref-filter-skip-parsing-objects-v4-0-2be68ce82c9a@pks.im>


* je/doc-data-model (2025-10-31) 2 commits
 - SQUASH??? fix xml that does not validate
 - doc: add an explanation of Git's data model

 Add a new manual that describes the data model.

 Expecting a (hopefully small and final) reroll?
 cf. <aQhcZwv0PdwNc6RW@pks.im>
 source: <pull.1981.v5.git.1761856336360.gitgitgadget@gmail.com>


* ps/history (2025-10-27) 12 commits
 - builtin/history: implement "split" subcommand
 - cache-tree: allow writing in-memory index as tree
 - add-patch: add support for in-memory index patching
 - add-patch: remove dependency on "add-interactive" subsystem
 - add-patch: split out `struct interactive_options`
 - add-patch: split out header from "add-interactive.h"
 - builtin/history: implement "reword" subcommand
 - builtin: add new "history" command
 - replay: stop using `the_repository`
 - replay: extract logic to pick commits
 - wt-status: provide function to expose status for trees
 - Merge branch 'sa/replay-atomic-ref-updates' into ps/history
 (this branch uses sa/replay-atomic-ref-updates.)

 "git history" history rewriting UI.

 Comments?
 source: <20251027-b4-pks-history-builtin-v6-0-407dd3f57ad3@pks.im>


* ms/doc-worktree-side-by-side (2025-10-10) 2 commits
 - doc: git-worktree: Add side by side branch checkout example
 - doc: git-worktree: Link to examples

 Document "git worktree add" and use of out-of-tree worktrees with
 examples.

 Expecting a reroll.
 cf. <CAPig+cSNesf0UwS4=Bxe-Qn+G9y3YYPyOK+7y3q8QJk+o7jaVg@mail.gmail.com>
 source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>


* sa/replay-atomic-ref-updates (2025-11-05) 3 commits
 - replay: add replay.refAction config option
 - replay: make atomic ref updates the default behavior
 - replay: use die_for_incompatible_opt2() for option validation
 (this branch is used by ps/history.)

 "git replay" (experimental) learned to perform ref updates itself
 in a transaction by default, instead of emitting where each refs
 should point at and leaving the actual update to another command.

 Will merge to 'next'?
 source: <20251105191650.89975-1-siddharthasthana31@gmail.com>


* ar/submodule-gitdir-tweak (2025-11-07) 4 commits
 - submodule: fix case-folding gitdir filesystem colisions
 - submodule: add extension to encode gitdir paths
 - builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
 - submodule--helper: use submodule_name_to_gitdir in add_submodule

 Avoid local submodule repository directory paths overlapping with
 each other by encoding submodule names before using them as path
 components.

 Comments?
 source: <20251107150547.3272180-1-adrian.ratiu@collabora.com>

--------------------------------------------------
[Discarded]

* ps/rust-cbindgen (2025-10-24) 6 commits
 . rust: generate bindings via cbindgen
 . meson: rename Rust library target
 . ci: use Debian instead of deprecated i386/ubuntu
 . gitlab-ci: backfill missing Linux jobs
 . gitlab-ci: reorder Linux job matrix to match GitHub's order
 . Merge branch 'ps/ci-rust' into ps/rust-cbindgen

 Introduce cbindgen in the build framework to help interfacing with
 Rust.

 Retracted.
 cf. <aQ3XOTX0AT_eFc5P@pks.im>
 source: <20251024-b4-pks-rust-cbindgen-v2-0-4b4bd4f18490@pks.im>

Re: What's cooking in git.git (Nov 2025, #03; Fri, 7)

[Toon Claes]

Junio C Hamano <gitster@pobox.com> writes:

> * tc/last-modified-active-paths-optimization (2025-10-23) 1 commit
>   (merged to 'next' on 2025-11-03 at 9ab444edfb)
>  + last-modified: implement faster algorithm
>
>  "git last-modified" was optimized by narrowing the set of paths to
>  follow as it dug deeper in the history.
>
>  Will cook in 'next'.
>  source: <20251023-b4-toon-last-modified-faster-v3-1-40a4ddbbadec@iotcl.com>

Do you plan to include these changes in the upcoming v2.52 release? I
would like to argue to include them.

Maybe it wasn't very clear how I phrased it in the v4 cover letter[1],
but without this patch, some results are wrong:

> As an added benefit, results are more consistent now. For example
> implementation in 'master' gives:
> 
>     $ git log --max-count=1 --format=%H -- pkt-line.h
>     15df15fe07ef66b51302bb77e393f3c5502629de
> 
>     $ git last-modified -- pkt-line.h
>     15df15fe07ef66b51302bb77e393f3c5502629de	pkt-line.h
> 
>     $ git last-modified | grep pkt-line.h
>     5b49c1af03e600c286f63d9d9c9fb01403230b9f	pkt-line.h
> 
> With the changes in this patch the results of git-last-modified(1)
> always match those of `git log --max-count=1`.

So this patch speeds up git-last-modified(1), but it also fixes some
buggy results. That's why I consider this a bug fix and worthy to make
it into the upcoming release. (which is by the way also the first
release that includes this subcommand)

[1]: https://lore.kernel.org/git/20251103154726.26592-1-toon@iotcl.com/

-- 
Cheers,
Toon

Re: What's cooking in git.git (Nov 2025, #03; Fri, 7)

[Junio C Hamano]

Toon Claes <toon@iotcl.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> * tc/last-modified-active-paths-optimization (2025-10-23) 1 commit
>>   (merged to 'next' on 2025-11-03 at 9ab444edfb)
>>  + last-modified: implement faster algorithm
>>
>>  "git last-modified" was optimized by narrowing the set of paths to
>>  follow as it dug deeper in the history.
>>
>>  Will cook in 'next'.
>>  source: <20251023-b4-toon-last-modified-faster-v3-1-40a4ddbbadec@iotcl.com>
>
> Do you plan to include these changes in the upcoming v2.52 release? I
> would like to argue to include them.

I plan to exclude, especially if it was not merged to 'next' before
2025-10-30, which is one calendar week before -rc1, to give the
topic the usual cooking period.

> Maybe it wasn't very clear how I phrased it in the v4 cover letter[1],
> but without this patch, some results are wrong:

Indeed it was unclear.  With respect to the output, the only thing I
recalled was (I just went back to the thread)

    One thing to note though, the results might be outputted in a different
    order than before. This is not considerd to be an issue because nowhere
    is documented the order is guaranteed.

and the patch came with a single test that gives a much later than
before in check_last_modified output, which does not clearly
demonstrate how the old results were wrong and the new results
correct them.

>> As an added benefit, results are more consistent now. For example
>> implementation in 'master' gives:
>> 
>>     $ git log --max-count=1 --format=%H -- pkt-line.h
>>     15df15fe07ef66b51302bb77e393f3c5502629de
>> 
>>     $ git last-modified -- pkt-line.h
>>     15df15fe07ef66b51302bb77e393f3c5502629de	pkt-line.h
>> 
>>     $ git last-modified | grep pkt-line.h
>>     5b49c1af03e600c286f63d9d9c9fb01403230b9f	pkt-line.h
>> 
>> With the changes in this patch the results of git-last-modified(1)
>> always match those of `git log --max-count=1`.
>
> So this patch speeds up git-last-modified(1), but it also fixes some
> buggy results. That's why I consider this a bug fix and worthy to make
> it into the upcoming release. (which is by the way also the first
> release that includes this subcommand)
>
> [1]: https://lore.kernel.org/git/20251103154726.26592-1-toon@iotcl.com/