Skip to contentSkip to conversation

What's cooking in git.git (Aug 2025, #11; Mon, 25)

DISCUSSION Junio C Hamano 1 participant 1 message Aug 26, 2025

lore
Share & tools
lore
#0 lore raw

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).

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

* dk/help-all (2025-08-03) 3 commits
(merged to 'next' on 2025-08-13 at 6dce87c0b5)
+ builtin: also setup gently for --help-all
+ parse-options: refactor flags for usage_with_options_internal
+ Merge branch 'ua/t1517-short-help-tests' into dk/help-all

"git cmd --help-all" now works outside repositories.
source: <[email protected]>

* dk/t7005-editor-updates (2025-08-13) 3 commits (merged to 'next' on 2025-08-17 at ad0ab2e2a9)
+ t7005: sanitize test environment for subsequent tests
+ t7005: stop abusing --exec-path
+ t7005: use modern test style

Test clean-up.
source: <[email protected]>

* ds/doc-count-objects-fix (2025-08-14) 1 commit
(merged to 'next' on 2025-08-17 at 1740ef34dd)
+ count-objects: document count-objects pack

Docfix.
source: <[email protected]>

* ja/doc-lint-sections-and-synopsis (2025-08-11) 6 commits (merged to 'next' on 2025-08-17 at 413ff100cd)
+ 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.
source: <[email protected]>

* lo/repo-info (2025-08-16) 5 commits
(merged to 'next' on 2025-08-19 at 9569e192d0)
+ 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
(this branch is used by lo/repo-info-step-2.)

A new subcommand "git repo" gives users a way to grab various repository characteristics.
source: <[email protected]>

* ps/commit-graph-wo-globals (2025-08-14) 6 commits (merged to 'next' on 2025-08-17 at e2889596be)
+ commit-graph: stop passing in redundant repository
+ commit-graph: stop using the_repository
+ commit-graph: stop using the_hash_algo
+ commit-graph: refactor parse_commit_graph() to take a repository
+ commit-graph: store the hash algorithm instead of its length
+ commit-graph: stop using the_hash_algo via macros

Remove dependency on the_repository and other globals from the commit-graph code, and other changes unrelated to de-globaling.
source: <20250815-b4-pks-commit-graph-wo-the-repository-v4-0-b6b651178cce@pks.im>

* tc/diff-tree-max-depth (2025-08-07) 3 commits (merged to 'next' on 2025-08-15 at dddb2275d4)
+ 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.
source: <[email protected]>

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

* bc/doc-compat-object-format-not-working (2025-08-26) 1 commit
- docs: note that extensions.compatobjectformat is incomplete

The compatObjectFormat extension is used to hide an incomplete feature that is not yet usable for any purpose other than developing the feature further. Document it as such to discourage its use by mere mortals.

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

* ds/doc-ggg-pr-fork-clarify (2025-08-23) 1 commit (merged to 'next' on 2025-08-25 at 71aea64ee4)
+ doc: clarify which remotes can be used with GitGitGadget

Update the instruction to use of GGG in the MyFirstContribution document to say that a GitHub PR could be made against git/git instead of gitgitgadget/git.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* jk/fetch-check-graph-objects-fix (2025-08-23) 1 commit
- fetch-pack: re-scan when double-checking graph objects

Under a race against another process that is repacking the repository, especially a partially cloned one, "git fetch" may have mistakenly think some objects we do have are missing, which has been corrected.

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

* js/doc-sending-patch-via-thunderbird (2025-08-22) 1 commit (merged to 'next' on 2025-08-25 at 1e63ebff8c)
+ doc/format-patch: adjust Thunderbird MUA hint to new add-on

Doc update.

Will merge to 'master'.
source: <[email protected]>

* js/progress-delay-fix (2025-08-25) 1 commit
- progress: pay attention to (customized) delay time

The start_delayed-Progress() function in the progress eye-candy API did not clear its internal state, making an initial delay value larger than 1 second ineffective, which has been corrected.

Will merge to 'next'.
cf. <[email protected]>
source: <[email protected]>

* kh/doc-config-typofix (2025-08-24) 1 commit
(merged to 'next' on 2025-08-25 at f82e0a4c9b)
+ doc: config: replace backtick with apostrophe for possessive

Documentation typofix.

Will merge to 'master'.
cf. <[email protected]>
source: <3ec6a00e3046166c7adb593f38c4099921d8ada3.1756064760.git.code@khaugsbakk.name>

* rs/describe-with-lazy-queue-and-khash (2025-08-24) 1 commit
- describe: use khash in finish_depth_computation()

Instead of scanning for the remaining items to see if there are still commits to be explored in the queue, use khash to remember which items are still on the queue (an unacceptable alternative is to reserve one object flag bits).

Will merge to 'next'?
source: <[email protected]>

* sg/line-log-merge-optim (2025-08-24) 4 commits
- line-log: simplify condition checking for merge commits
- line-log: initialize diff queue in process_ranges_ordinary_commit()
- line-log: get rid of the parents array in process_ranges_merge_commit()
- line-log: avoid unnecessary tree diffs when processing merge commits

"git log -L..." compared trees of multiple parents with the tree of the merge result in an unnecessarily inefficient way.

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

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

* lo/repo-info-step-2 (2025-08-20) 3 commits
- repo: add the field objects.format
- repo: add the flag -z as an alias for --format=nul
- Merge branch 'lo/repo-info' into lo/repo-info-step-2

"repo info" learns a short-hand option "-z" that is the same as "--format=nul", and learns to report the objects format used in the repository.

Expecting a reroll.
cf. <6186055.lOV4Wx5bFT@cayenne>
source: <[email protected]>

* jc/doc-includeif-hasconfig-remote-url-fix (2025-08-21) 1 commit
- config: document includeIf conditions consistently

Doc mark-up fix.

Will merge to 'next'?
source: <[email protected]>

* jk/add-i-color (2025-08-21) 4 commits
- contrib/diff-highlight: mention interactive.diffFilter
- add-interactive: manually fall back color config to color.ui
- add-interactive: respect color.diff for diff coloring
- stash: pass --no-color to diff-tree child processes

Some among "git add -p" and friends ignored color.diff and/or color.ui configuration variables, which is an old regression, which has been corrected.

Will merge to 'next'?
source: <[email protected]>

* jt/de-global-bulk-checkin (2025-08-22) 4 commits
- bulk-checkin: use repository variable from transaction
- bulk-checkin: require transaction for index_blob_bulk_checkin()
- bulk-checkin: remove global transaction state
- bulk-checkin: introduce object database transaction structure

The bulk-checkin code used to depend on a file-scope static singleton variable, which has been updated to pass an instance throughout the callchain.

Will merge to 'next'?
source: <[email protected]>

* kh/doc-interpret-trailers-markup-fix (2025-08-22) 1 commit (merged to 'next' on 2025-08-25 at 9bee54a64d)
+ doc: interpret-trailers: close all pairs of single quotes

Fix missing single-quote pairs in a documentation page.

Will merge to 'master'.
source: <4eac944102a846695a9f61ead39a5a86361a0532.1755875970.git.code@khaugsbakk.name>

* ar/submodule-gitdir-tweak (2025-08-18) 10 commits
. fixup! t: add gitdir encoding tests
. t: add gitdir encoding tests
. t: move nested gitdir tests to proper location
. submodule: remove validate_submodule_git_dir()
. submodule: encode gitdir paths to avoid conflicts
. strbuf: bring back is_rfc3986_unreserved
. t: submodules: add basic mixed gitdir path tests
. submodule: add gitdir path config override
. submodule: create new gitdirs under submodules path
. 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.

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

* jk/describe-blob (2025-08-18) 5 commits (merged to 'next' on 2025-08-21 at 671998ff24)
+ describe: pass commit to describe_commit()
+ describe: handle blob traversal with no commits
+ describe: catch unborn branch in describe_blob()
+ describe: error if blob not found
+ describe: pass oid struct by const pointer

"git describe <blob>" misbehaves and/or crashes in some corner cases, which has been taught to exit with failure gracefully.

Will merge to 'master'.
source: <[email protected]>

* ds/doc-community-discord (2025-08-20) 1 commit
(merged to 'next' on 2025-08-21 at 7f9aa8da4e)
+ doc: add discord to ways of getting help

Discord has been added to the first contribution documentation as another way to ask for help.

Will merge to 'master'.
source: <[email protected]>

* je/doc-add (2025-08-19) 2 commits
(merged to 'next' on 2025-08-25 at 0c84501ed2)
+ doc: git-add: simplify discussion of ignored files
+ doc: git-add: clarify intro & add an example

Documentation for "git add" has been updated.

Will merge to 'master'.
source: <[email protected]>

* jk/no-clobber-dangling-symref-with-fetch (2025-08-19) 4 commits (merged to 'next' on 2025-08-21 at 29b96663c0)
+ refs: do not clobber dangling symrefs
+ t5510: prefer "git -C" to subshell for followRemoteHEAD tests
+ t5510: stop changing top-level working directory
+ t5510: make confusing config cleanup more explicit

"git fetch" can clobber a symref that is dangling when the remote-tracking HEAD is set to auto update, which has been corrected.

Will merge to 'master'.
source: <[email protected]>

* ds/path-walk-repack-fix (2025-08-25) 2 commits
- path-walk: create initializer for path lists
- path-walk: fix setup of pending objects

"git repack --path-walk" lost objects in some corner cases, which has been corrected.

Will merge 'next'.
source: <[email protected]>

* js/doc-gitk-history (2025-08-19) 1 commit (merged to 'next' on 2025-08-21 at e7e1a08f82)
+ doc/gitk: update reference to the external project

Manual page for "gitk" is updated with the current maintainer's name.

Will merge to 'master'.
source: <[email protected]>

* sg/line-log-boundary-fixes (2025-08-18) 2 commits
- line-log: show all line ranges touched by the same diff range
- line-log: fix assertion error

Fix for a corner case bug in "git log -L...".

Will merge to 'next'?
source: <[email protected]>

* ja/asciidoc-doctor-verbatim-fixes (2025-08-20) 1 commit (merged to 'next' on 2025-08-22 at 61fb953314)
+ doc: fix asciidoc format compatibility in pretty-formats.adoc

Doc mark-up fix.

Will merge to 'master'.
source: <[email protected]>

* ad/t1517-short-help-tests-fix (2025-08-19) 1 commit (merged to 'next' on 2025-08-21 at f686ad352a)
+ t/t1517: mark tests that fail with GIT_TEST_INSTALLED

Test fix.

Will merge to 'master'.
source: <[email protected]>

* jc/longer-disambiguation-fix (2025-08-14) 1 commit
- abbrev: allow extending beyond 32 chars to disambiguate

"git rev-parse --short" and friends failed to disambiguate two objects with object names that share common prefix longer than 32 characters.

Will merge to 'next'?
source: <[email protected]>

* tc/t0450-harden (2025-08-12) 3 commits
- fixup! t0450: add allowlist for builtins with missing .adoc
- t0450: add allowlist for builtins with missing .adoc
- t0450: fix test for out-of-tree builds

Test updates.

Expecting a reroll after 2.51 final.
source: <[email protected]>

* je/doc-rebase (2025-08-22) 5 commits
- doc: git-rebase: update discussion of internals
- doc: git-rebase: move --onto explanation down
- doc: git rebase: clarify arguments syntax
- doc: git rebase: dedup merge conflict discussion
- doc: git-rebase: start with an example

Documentation for "git rebase" has been updated.

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

* ps/reftable-libgit2-cleanup (2025-08-12) 8 commits (merged to 'next' on 2025-08-21 at ff82e3fa11)
+ refs/reftable: always reload stacks when creating lock
+ reftable: don't second-guess errors from flock interface
+ reftable/stack: handle outdated stacks when compacting
+ reftable/stack: allow passing flags to reftable_stack_add()
+ reftable/stack: fix compiler warning due to missing braces
+ reftable/stack: reorder code to avoid forward declarations
+ reftable/writer: drop Git-specific QSORT() macro
+ reftable/writer: fix type used for number of records

Code clean-ups.

Will merge to 'master'.
source: <[email protected]>

* 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 protected]>
source: <[email protected]>

* ps/object-store-midx-dedup-info (2025-08-11) 11 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: simplify calling link_alt_odb_entry()
- odb: return newly created in-memory sources
- odb: consistently use "dir" to refer to alternate's directory
- 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?
cf. <[email protected]>
source: <20250811-b4-pks-midx-deduplicate-source-info-v3-0-e442bdf2b4ad@pks.im>

* am/xdiff-hash-tweak (2025-07-28) 2 commits
- 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.

Still being discussed (AUG13)
cf. <[email protected]>
source: <[email protected]>

* ag/send-email-imap-sent (2025-08-11) 2 commits
- send-email: enable copying emails to an IMAP folder without actually sending them
- 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.

Will merge to 'next'?
source: <PN3PR01MB9597E8E33868386C997D2563B82BA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>

* 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 protected]>

* 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.

Will merge to 'next'?
source: <[email protected]>

* 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 protected]>

* 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. <CAE7as+bnG6KgA8X_n36pqP15bmyM6re+xEb1MOXKvZSUdJ8Arg@mail.gmail.com>
source: <[email protected]>

* 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 protected]>
source: <[email protected]>

* 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 protected]>