Subject: What's cooking in git.git (Aug 2025, #03; Thu, 7)

From: Junio C Hamano <[email-masked]>
Date: Thu, 07 Aug 2025 10:17:08 -0700

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.51-rc1 was just tagged.

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']

* dl/squelch-maybe-uninitialized (2025-08-04) 2 commits
  (merged to 'next' on 2025-08-05 at fa3c3830ee)
 + t/unit-tests/clar: fix -Wmaybe-uninitialized with -Og
 + remote: bail early from set_head() if missing remote name

 Squelch false-positive compiler warning.
 source: <[email-masked]>

* jk/revert-squelch-compiler-warning (2025-08-04) 1 commit
  (merged to 'next' on 2025-08-05 at 344a6a715b)
 + revert: initialize const value

 Squelch false-positive compiler warning.
 source: <[email-masked]>

* jt/archive-zip-deflate-fix (2025-08-02) 1 commit
  (merged to 'next' on 2025-08-06 at 1a5c1ccec3)
 + archive: flush deflate stream until Z_STREAM_END

 The deflate codepath in "git archive --format=zip" had a
 longstanding bug coming from misuse of zlib API, which has been
 corrected.
 source: <[email-masked]>

* kj/renamed-submodule (2025-07-24) 4 commits
  (merged to 'next' on 2025-08-03 at c341b36545)
 + fixup! submodule: skip redundant active entries when pattern covers path
 + fixup! submodule: prevent overwriting .gitmodules on path reuse
 + submodule: skip redundant active entries when pattern covers path
 + submodule: prevent overwriting .gitmodules on path reuse

 The case where a new submodule takes a path where used to be a
 completely different subproject is now dealt a bit better than
 before.
 source: <[email-masked]>

* ps/object-file-wo-the-repository (2025-07-16) 17 commits
  (merged to 'next' on 2025-08-01 at 0c1253014e)
 + object-file: get rid of `the_repository` in index-related functions
 + object-file: get rid of `the_repository` in `force_object_loose()`
 + object-file: get rid of `the_repository` in `read_loose_object()`
 + object-file: get rid of `the_repository` in loose object iterators
 + object-file: remove declaration for `for_each_file_in_obj_subdir()`
 + object-file: inline `for_each_loose_file_in_objdir_buf()`
 + object-file: get rid of `the_repository` when writing objects
 + odb: introduce `odb_write_object()`
 + loose: write loose objects map via their source
 + object-file: get rid of `the_repository` in `finalize_object_file()`
 + object-file: get rid of `the_repository` in `loose_object_info()`
 + object-file: get rid of `the_repository` when freshening objects
 + object-file: inline `check_and_freshen()` functions
 + object-file: get rid of `the_repository` in `has_loose_object()`
 + object-file: stop using `the_hash_algo`
 + object-file: fix -Wsign-compare warnings
 + Merge branch 'ps/object-store' into ps/object-file-wo-the-repository

 Reduce implicit assumption and dependence on the_repository in the
 object-file subsystem.
 cf. <[email-masked]>
 cf. <[email-masked]>
 source: <[email-masked]>

* rs/tighten-alias-help (2025-07-25) 1 commit
  (merged to 'next' on 2025-08-01 at a0fb0696cd)
 + git: show alias info only with lone -h

 "git -c alias.foo=bar foo -h baz" reported "'foo' is aliased to
 'bar'" and then went on to run "git foo -h baz", which was
 unexpected.  Tighten the rule so that alias expansion is reported
 only when "-h" is the sole option.
 source: <[email-masked]>

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

* dl/push-missing-object-error (2025-08-04) 2 commits
 - remote.c: remove BUG in show_push_unqualified_ref_name_error()
 - t5516: introduce 'push ref expression with non-existent oid src'

 "git push" had a code path that led to BUG() but it should have
 been a die(), as it is a response to a usual but invalid end-user
 action to attempt pushing an object that does not exist.

 Expecting a reroll to correct an overlong line.
 source: <[email-masked]>

* ja/doc-lint-sections-and-synopsis (2025-08-05) 7 commits
 - fixup! doc: check for absence of multiple terms in each entry of desc list
 - doc lint: check that synopsis manpages have synopsis inlines
 - doc:git-for-each-ref: fix styling and typos
 - doc: check for absence of the form --[no-]parameter
 - doc: check for absence of multiple terms in each entry of desc list
 - doc: check well-formedness of delimited sections
 - doc: test linkgit macros for well-formedness

 Doc lint updates to encourage the newer and easier-to-use
 `synopsis` format, with fixes to a handful of existing uses.

 Comments?
 source: <[email-masked]>

* js/rebase-i-allow-drop-on-a-merge (2025-08-06) 1 commit
  (merged to 'next' on 2025-08-07 at bc44e9dc1b)
 + rebase -i: permit 'drop' of a merge commit

 During interactive rebase, using 'drop' on a merge commit lead to
 an error, which was incorrect.

 Will cook in 'next'.
 source: <[email-masked]>

* ms/refs-list (2025-08-05) 6 commits
 - t: add test for git refs list subcommand
 - t6300: refactor tests to be shareable
 - builtin/refs: add list subcommand
 - builtin/for-each-ref: factor out core logic into a helper
 - builtin/for-each-ref: align usage string with the man page
 - doc: factor out common option

 The "list" subcommand of "git refs" acts as a front-end for
 "git for-each-ref".

 Comments?
 source: <[email-masked]>

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

* ps/reftable-libgit2-cleanup (2025-08-04) 6 commits
 - reftable/stack: handle outdated stacks when compacting
 - reftable/stack: allow passing flags to `reftable_stack_add()`
 - reftable/stack: reorder code to avoid forward declarations
 - reftable/stack: fix compiler warning due to missing braces
 - reftable/writer: drop Git-specific `QSORT()` macro
 - reftable/writer: fix type used for number of records

 Code clean-ups.

 Comments?
 source: <[email-masked]>

* tc/diff-tree-max-depth (2025-07-29) 3 commits
 - diff: teach tree-diff a max-depth parameter
 - within_depth: fix return for empty path
 - combine-diff: zero memory used for callback filepairs

 "git diff-tree" learned "--max-depth" option.

 Comments?
 source: <[email-masked]>

* dk/help-all (2025-08-03) 4 commits
 - builtin: also setup gently for --help-all
 - parse-options: refactor flags for usage_with_options_internal
 - t1517: fixup for ua/t1517-short-help-tests
 - Merge branch 'ua/t1517-short-help-tests' into dk/help-all
 (this branch uses ua/t1517-short-help-tests.)

 "git cmd --help-all" outside repository.

 Comments?
 source: <[email-masked]>

* lc/rebase-trailer (2025-08-03) 2 commits
 - rebase: support --trailer
 - trailer: append trailers in-process and drop the fork to `interpret-trailers`

 Expecting a reroll.
 cf. <[email-masked]>
 source: <[email-masked]>

* ly/diff-name-only-with-diff-from-content (2025-08-06) 2 commits
 - fixup! diff: ensure consistent diff behavior with ignore options
 - diff: ensure consistent diff behavior with ignore options

 Various options to "git diff" that makes comparison ignore certain
 aspects of the differences (like "space changes are ignored",
 "differences in lines that match these regular expressions are
 ignored") did not work well with "--name-only" and friends.

 Looking better.
 source: <[email-masked]>

* rs/describe-with-prio-queue (2025-08-03) 2 commits
  (merged to 'next' on 2025-08-07 at 5ebcaaf8b8)
 + describe: use prio_queue_replace()
 + describe: use prio_queue

 "git describe" has been optimized by using better data structure.

 Will cook in 'next'.
 source: <[email-masked]>

* ps/object-store-midx-dedup-info (2025-07-29) 9 commits
 - midx: compute paths via their source
 - midx: stop duplicating info redundant with its owning source
 - midx: write multi-pack indices via their source
 - midx: load multi-pack indices via their source
 - midx: drop redundant `struct repository` parameter
 - odb: return newly created in-memory sources
 - odb: allow `odb_find_source()` to fail
 - odb: store locality in object database sources
 - Merge branch 'ps/object-store-midx' into ps/object-store-midx-dedup-info

 Further code clean-up for multi-pack-index code paths.

 Comments?
 source: <[email-masked]>

* jc/strbuf-split (2025-07-31) 13 commits
 - trace2: do not use strbuf_split*()
 - trace2: trim_trailing_newline followed by trim is a no-op
 - sub-process: do not use strbuf_split*()
 - environment: do not use strbuf_split*()
 - config: do not use strbuf_split()
 - notes: do not use strbuf_split*()
 - merge-tree: do not use strbuf_split*()
 - clean: do not use strbuf_split*() [part 2]
 - clean: do not pass the whole structure when it is not necessary
 - clean: do not use strbuf_split*() [part 1]
 - clean: do not pass strbuf by value
 - wt-status: avoid strbuf_split*()
 - Merge branch 'jc/string-list-split' into jc/strbuf-split
 (this branch uses jc/string-list-split.)

 Arrays of strbuf is often a wrong data structure to use, and
 strbuf_split*() family of functions that create them often have
 better alternatives.

 Update several code paths and replace strbuf_split*().

 Will merge to 'next'.
 source: <[email-masked]>

* jc/string-list-split (2025-08-01) 7 commits
 - string-list: split-then-remove-empty can be done while splitting
 - string-list: optionally omit empty string pieces in string_list_split*()
 - diff: simplify parsing of diff.colormovedws
 - string-list: optionally trim string pieces split by string_list_split*()
 - string-list: unify string_list_split* functions
 - string-list: align string_list_split() with its _in_place() counterpart
 - string-list: report programming error with BUG
 (this branch is used by jc/strbuf-split.)

 string_list_split*() family of functions have been extended to
 simplify common use cases.

 Will merge to 'next'.
 source: <[email-masked]>

* am/xdiff-hash-tweak (2025-07-28) 3 commits
 - fixup! xdiff: optimize xdl_hash_record_verbatim
 - xdiff: optimize xdl_hash_record_verbatim
 - xdiff: refactor xdl_hash_record()

 Inspired by Ezekiel's recent effort to showcase Rust interface, the
 hash function implementation used to hash lines have been updated
 to the one used for ELF symbol lookup by Glibc.

 Comments?
 source: <[email-masked]>

* ps/remote-rename-fix (2025-07-31) 7 commits
  (merged to 'next' on 2025-08-07 at 227d2faf29)
 + builtin/remote: only iterate through refs that are to be renamed
 + builtin/remote: rework how remote refs get renamed
 + builtin/remote: determine whether refs need renaming early on
 + builtin/remote: fix sign comparison warnings
 + refs: simplify logic when migrating reflog entries
 + refs: pass refname when invoking reflog entry callback
 + Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix
 (this branch uses ps/reflog-migrate-fixes.)

 "git remote rename origin upstream" failed to move origin/HEAD to
 upstream/HEAD when origin/HEAD is unborn and performed other
 renames extremely inefficiently, which has been corrected.

 Will cook in 'next'.
 source: <[email-masked]>

* ag/send-email-imap-sent (2025-07-22) 1 commit
 - send-email: add ability to send a copy of sent emails to an IMAP folder

 "git send-email" learned to drive "git imap-send" to store already
 sent e-mails in an IMAP folder.

 A reroll (v4) exists.
 cf. <[email-masked]>
 source: <da7c[email-masked]>

* en/ort-rename-fixes (2025-08-05) 6 commits
 - merge-ort: fix directory rename on top of source of other rename/delete
 - merge-ort: fix incorrect file handling
 - t6423: fix missed staging of file in testcases 12i,12j,12k
 - t6423: document two bugs with rename-to-self testcases
 - merge-ort: drop unnecessary temporary in check_for_directory_rename()
 - merge-ort: update comments to modern testfile location

 Various bugs about rename handling in "ort" merge strategy have
 been fixed.

 Looking good.
 source: <[email-masked]>

* ps/reflog-migrate-fixes (2025-08-05) 9 commits
  (merged to 'next' on 2025-08-07 at 8068e2ad68)
 + refs: fix invalid old object IDs when migrating reflogs
 + refs: stop unsetting REF_HAVE_OLD for log-only updates
 + refs/files: detect race when generating reflog entry for HEAD
 + refs: fix identity for migrated reflogs
 + ident: fix type of string length parameter
 + builtin/reflog: implement subcommand to write new entries
 + refs: export `ref_transaction_update_reflog()`
 + builtin/reflog: improve grouping of subcommands
 + Documentation/git-reflog: convert to use synopsis type
 (this branch is used by ps/remote-rename-fix.)

 "git refs migrate" to migrate the reflog entries from a refs
 backend to another had a handful of bugs squashed.

 Will cook in 'next'.
 source: <[email-masked]>

* ds/sparse-checkout-clean (2025-07-16) 9 commits
 - sparse-checkout: make 'clean' clear more files
 - t: expand tests around sparse merges and clean
 - sparse-index: point users to new 'clean' action
 - sparse-checkout: add --verbose option to 'clean'
 - dir: add generic "walk all files" helper
 - sparse-checkout: match some 'clean' behavior
 - sparse-checkout: add basics of 'clean' command
 - sparse-checkout: remove use of the_repository
 - Merge branch 'ac/deglobal-sparse-variables' into ds/sparse-checkout-clean
 (this branch uses ac/deglobal-sparse-variables.)

 "git sparse-checkout" subcommand learned a new "clean" action to
 prune otherwise unused working-tree files that are outside the
 areas of interest.

 Needs to wait for the base topic to solidify.
 source: <[email-masked]>

* pw/3.0-commentchar-auto-deprecation (2025-07-31) 4 commits
 - commit: print advice when core.commentString=auto
 - config: warn on core.commentString=auto
 - breaking-changes: deprecate support for core.commentString=auto
 - Merge branch 'ps/config-wo-the-repository' into pw/3.0-commentchar-auto-deprecation

 Proposes to deprecate "core.commentChar=auto" that attempts to
 dynamically pick a suitable comment character, as it is too much
 trouble to support for little benefit.

 Comments?
 source: <[email-masked]>

* ua/t1517-short-help-tests (2025-08-02) 3 commits
 - t5304: move `prune -h` test from t1517
 - t5200: move `update-server-info -h` test from t1517
 - t/t1517: automate `git subcmd -h` tests outside a repository
 (this branch is used by dk/help-all.)

 Test shuffling.

 Needs the perl-prereq touch-up squashed in from dk/help-all topic.
 source: <[email-masked]>

* tc/last-modified (2025-08-05) 4 commits
 - fixup! last-modified: new subcommand to show when files were last modified
 - last-modified: use Bloom filters when available
 - t/perf: add last-modified perf script
 - last-modified: new subcommand to show when files were last modified

 A new command "git last-modified" is proposed to show the closest
 ancestor commit that touched each path.
 source: <[email-masked]>

* lo/repo-info (2025-08-06) 5 commits
 - repo: add the --format flag
 - repo: add the field layout.shallow
 - repo: add the field layout.bare
 - repo: add the field references.format
 - repo: declare the repo command

 A new subcommand "git repo" gives users a way to grab various
 repository characteristics.

 Comments?
 source: <[email-masked]>

* ac/deglobal-sparse-variables (2025-07-18) 3 commits
 - environment: remove the global variable 'sparse_expect_files_outside_of_patterns'
 - environment: move access to "core.sparsecheckoutcone" into repo_settings
 - environment: move access to "core.sparsecheckout" into repo_settings
 (this branch is used by ds/sparse-checkout-clean.)

 Two global variables related to sparse checkout have been moved to
 the repository settings structure.

 Expecting a reroll.
 cf. <[email-masked]>
 source: <[email-masked]>

* tb/prepare-midx-pack-cleanup (2025-05-28) 5 commits
 - midx: return a `packed_git` pointer from `prepare_midx_pack()`
 - midx-write.c: extract inner loop from fill_packs_from_midx()
 - midx-write.c: guard against incremental MIDXs in want_included_pack()
 - midx: access pack names through `nth_midxed_pack_name()`
 - Merge branch 'ps/midx-negative-packfile-cache' into tb/prepare-midx-pack-cleanup

 Improvement on Multi-pack-index API.

 Expecting a reroll.
 cf. <[email-masked]>
 source: <[email-masked]>

* cc/promisor-remote-capability (2025-07-31) 5 commits
 - promisor-remote: use string constants for 'name' and 'url' too
 - promisor-remote: allow a client to check fields
 - promisor-remote: refactor how we parse advertised fields
 - promisor-remote: allow a server to advertise more fields
 - promisor-remote: refactor to get rid of 'struct strvec'

 The "promisor-remote" capability mechanism has been updated to
 allow the "partialCloneFilter" settings and the "token" value to be
 communicated from the server side.

 Expecting a reroll.
 source: <[email-masked]>

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

* pw/compound-literal-test-balloon (2025-07-14) 1 commit
 . strbuf: add compound literal test balloon

 Gauge if the world is ready for compound literal that can make the
 resulting code clearer in some places.

 Discarded; it turns out that we already have a test balloon on this.
 source: <7ac5[email-masked]>

* jc/tag-idempotent-no-op (2025-07-11) 1 commit
 . tag: allow idempotent "git tag" without "--force"

 "git tag T O" when the tag T is already pointing at the object O is
 a no-op; we used to but no longer error out such a request and
 require "--force" and instead turn it into a no-op.

 Will discard.
 cf. <dt5ruadvr7lmhsbypmb6yili5cookfx5btw4gzfeui7ehxxajv@ziael4udbbcy>
 source: <[email-masked]>