Skip to contentSkip to conversation

What's cooking in git.git (Jun 2026, #07)

DISCUSSION Junio C Hamano 2 participants 3 messages Jun 20 – Jun 22

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 is a 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 a URL to a message that raises issues but they are by no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course they can be resubmitted when new interests arise).

Git 2.55-rc1 has been tagged and pushed out. There may be a few more topics in 'next' that we may want to include in the release that I didn't manage or I forgot (please let me know), but basically this development cycle is over, the tree is feature-frozen, and remaining topics in 'next' will stay in "Will cook in 'next'" instead of "Will merge to 'master'" state. We'd want to force ourselves to concentrate on addressing topics that are important fixes but still in the "Needs review" state, and of course, find any correct any regressions relative to Git 2.54, until we are ready to tag Git 2.55 final.

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/posix-unused-warning-clang (2026-06-13) 3 commits (merged to 'next' on 2026-06-15 at 1d7e627c24)
+ compat/posix.h: simplify GIT_GNUC_PREREQ() comparison
+ compat/posix.h: clean up GIT_GNUC_PREREQ() and UNUSED
+ compat/posix.h: enable UNUSED warning messages for Clang

The UNUSED macro in 'compat/posix.h' has been updated to use a newly introduced GIT_CLANG_PREREQ macro for compiler version checks, and the existing GIT_GNUC_PREREQ macro has been modernized to use explicit major/minor comparisons rather than bit-shifting. cf. <[email protected]>
source: <[email protected]>

* en/commit-graph-timestamp-fix (2026-06-13) 1 commit (merged to 'next' on 2026-06-16 at 13248b8196)
+ commit-graph: use timestamp_t for max parent generation accumulator

compute_reachable_generation_numbers() in commit-graph used a 32-bit integer to accumulate parent generations, which is OK for generation number v1 (topological levels), but with generation number v2 (adjusted committer timestamps), it truncated timestamps beyond 2106. Fixed by widening the accumulator to timestamp_t. cf. <[email protected]>
source: <[email protected]>

* jc/t1400-fifo-cleanup (2026-06-10) 1 commit
(merged to 'next' on 2026-06-15 at 7d5acd110a)
+ t1400: have fifo test clean after itself

Test cleanup.
cf. <[email protected]>
source: <[email protected]>

* js/objects-larger-than-4gb-on-windows (2026-06-18) 1 commit (merged to 'next' on 2026-06-18 at 99d7cf9126)
+ zlib: properly clamp to uLong

A hotfix to an earlier attempt to update code paths that assumed "unsigned long" was long enough for "size_t".
source: <[email protected]>

* ps/transport-helper-tsan-fix (2026-06-09) 1 commit (merged to 'next' on 2026-06-15 at 0857e6696f)
+ transport-helper: fix TSAN race in transfer_debug()

The TSAN race in transfer_debug() within transport-helper.c has been resolved by initializing the debug flag early in bidirectional_transfer_loop() before spawning worker threads, allowing the removal of a TSAN suppression.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* ta/doc-config-adoc-fixes (2026-06-11) 3 commits (merged to 'next' on 2026-06-15 at 93340b5cf0)
+ doc: git-config: escape erroneous highlight markup
+ doc: config/sideband: fix description list delimiter
+ doc: config: terminate runaway lists

Various AsciiDoc markup fixes in 'git config' documentation and related files to ensure lists and formatting are rendered correctly. cf. <[email protected]>
source: <[email protected]>

* td/describe-tag-iteration (2026-06-10) 1 commit
(merged to 'next' on 2026-06-15 at 1ae171f3b7)
+ describe: limit default ref iteration to tags

'git describe' has been taught to pass the 'refs/tags/' prefix down to the ref iterator when '--all' is not requested, avoiding unnecessary iteration over non-tag refs.
cf. <[email protected]>
source: <[email protected]>

* td/ls-files-pathspec-prefilter (2026-06-11) 1 commit (merged to 'next' on 2026-06-15 at 38918c4cfd)
+ ls-files: filter pathspec before lstat

git ls-files --modified and git ls-files --deleted have been optimized to filter with pathspec before calling lstat() when there is only a single pathspec item, avoiding unnecessary filesystem access for entries that will not be shown.
cf. <[email protected]>
source: <[email protected]>

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

* jc/submittingpatches-design-critiques (2026-06-19) 1 commit
- SubmittingPatches: address design critiques

The documentation in SubmittingPatches has been updated to clarify how patch contributors should respond to design and viability critiques, and how the resolution of such critiques should be recorded in the final commit messages.

Needs review.
source: <[email protected]>

* wy/doc-clarify-review-replies (2026-06-17) 2 commits
- doc: advise batching patch rerolls
- doc: encourage review replies before rerolling

Documentation on community contribution guidelines has been updated to encourage replying to review comments before rerolling, and to advise a default limit of at most one reroll per day to give reviewers across different time zones enough time to participate.

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

* ps/gitlab-ci-windows (2026-06-15) 1 commit
- gitlab-ci: migrate Windows builds away from Chocolatey

Wean the Windows builds in GitLab CI procedure away from (unfortunately unreliable) Chocolatey to install dependencies.

Will merge to 'next'?
cf. <ajL1677NQShTO6tD@denethor>
source: <20260615-b4-pks-gitlab-ci-drop-chocolatey-v1-1-51a6e7d5e388@pks.im>

* ty/migrate-ignorecase (2026-06-19) 2 commits
- config: use repo_ignore_case() to access core.ignorecase
- environment: move ignore_case into repo_config_values

The global configuration variable ignore_case (representing the core.ignorecase configuration) has been migrated into struct repo_config_values to tie it to a specific repository instance.

Needs review.
source: <[email protected]>

* mm/line-log-limited-ops (2026-06-18) 7 commits
- diffcore-pickaxe: scope -G to the -L tracked range
- diff: support --check with -L line ranges
- line-log: support diff stat formats with -L
- diff: extract a line-range diff helper for reuse
- diff: emit -L hunk headers via xdiff's formatter
- diff: simplify the line-range filter by classifying removals immediately
- diff: rename and group the line-range filter for clarity

"git log -L<range>:<path>" learned to limit various "diff" operations like --stat, --check, -G, to the specified range:path.

Waiting for response(s) to review comment(s). cf. <[email protected]>
source: <[email protected]>

* hn/history-squash (2026-06-18) 6 commits
- SQUASH??? avoid test_grep lint triggering on uses of raw grep
- SQUASH??? avoid test number clash by moving 3454-h-squash to 3455
- history: re-edit a squash with every message
- history: add squash subcommand to fold a range
- history: give commit_tree_ext a message template
- history: extract helper for a commit's parent tree

The experimental "git history" command has been taught a new "squash" subcommand to fold a range of commits into a single commit, replaying any descendants on top.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* ps/t4216-tap-fix (2026-06-19) 1 commit
- t4216: fix no-op test that breaks TAP output

TAP output breakage fix.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* hn/macos-linker-warning (2026-06-19) 1 commit
- config.mak.uname: avoid macOS dup-library warning

Xcode 15 and later has a linker set to complain when the same library archive is listed twice on the command line. Squelch the annoyance.

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

--------------------------------------------------
[Stalled]

* jt/config-lock-timeout (2026-05-17) 1 commit
- config: retry acquiring config.lock, configurable via core.configLockTimeout

Configuration file locking now retries for a short period, avoiding failures when multiple processes attempt to update the configuration simultaneously.

Waiting for response(s) to review comment(s) for too long, stalled. cf. <[email protected]>
source: <[email protected]>

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

* mh/fetch-follow-remote-head-config (2026-06-19) 8 commits
- fetch: fixup a misaligned comment
- fetch: add configuration variable fetch.followRemoteHEAD
- fetch: refactor do_fetch handling of followRemoteHEAD
- fetch: return 0 on known git_fetch_config
- fetch: rename function report_set_head
- t5510: cleanup remote in followRemoteHEAD dangling ref test
- doc: explain fetchRemoteHEADWarn advice
- fetch: fixup set_head advice for warn-if-not-branch

The fetch.followRemoteHEAD configuration variable has been added to provide a default for the per-remote remote.<name>.followRemoteHEAD setting.

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

* ps/refs-writing-subcommands (2026-06-17) 5 commits
- builtin/refs: add "rename" subcommand
- builtin/refs: add "create" subcommand
- builtin/refs: add "update" subcommand
- builtin/refs: add "delete" subcommand
- builtin/refs: drop the_repository

The "git refs" toolbox has been extended with new "create", "delete", "update", and "rename" subcommands to create, delete, update, and

 rename references, respectively.

Needs review.
source: <[email protected]>

* po/hash-object-size-t (2026-06-16) 6 commits
- hash-object: add a >4GB/LLP64 test case using filtered input
- hash-object: add another >4GB/LLP64 test case
- hash-object --stdin: verify that it works with >4GB/LLP64
- hash algorithms: use size_t for section lengths
- object-file.c: use size_t for header lengths
- hash-object: demonstrate a >4GB/LLP64 problem

Support for hashing loose or packed objects larger than 4GB on Windows and other LLP64 platforms has been improved by converting object header buffers and data-handling functions from 'unsigned long' to 'size_t'.

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

* kh/submittingpatches-trailers (2026-06-18) 5 commits
- SubmittingPatches: note that trailer order matters
- SubmittingPatches: be consistent with trailer markup
- SubmittingPatches: document Based-on-patch-by trailer
- SubmittingPatches: discourage common Linux trailers
- SubmittingPatches: encourage trailer use for substantial help

The trailer sections in SubmittingPatches have been updated to encourage use of standard trailers.

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

* mv/log-follow-mergy (2026-06-14) 1 commit
- log: improve --follow following renames for non-linear history

"git log --follow" has been updated to handle non-linear history, in which the path being tracked gets renamed differently in multiple history lines, better.

Needs review.
source: <[email protected]>

* wy/doc-myfirstcontribution-trim-quotes (2026-06-11) 1 commit
- MyFirstContribution: mention trimming quoted text in replies

The contributor guide has been updated to advise new contributors to trim irrelevant quoted text when replying to review comments, matching the existing advice given to reviewers.

Comments?
cf. <[email protected]>
source: <080402ff0ac8127b654dccea59a1bf643df62a5c.1781186476.git.wy@wyuan.org>

* tb/midx-incremental-custom-base (2026-06-12) 3 commits
- midx-write: include packs above custom incremental base
- midx: pass custom '--base' through incremental writes
- t5334: expose shared nth_line() helper

The git multi-pack-index write --incremental command has been corrected to properly honor the --base option. Previously, the custom base was ignored by the normal write path, and the pack exclusion logic incorrectly skipped packs from layers above the selected base, breaking reachability closure for bitmaps.

Needs review.
source: <[email protected]>

* mm/test-grep-lint (2026-06-12) 6 commits
- t: add greplint to detect bare grep assertions
- t: convert grep assertions to test_grep
- t: fix Lexer line count for $() inside double-quoted strings
- t: extract chainlint's parser into shared module
- t: fix grep assertions missing file arguments
- t/README: document test_grep helper

Needs review.
source: <[email protected]>

* js/objects-larger-than-4gb-on-windows-more (2026-06-15) 7 commits (merged to 'next' on 2026-06-18 at 2b3ac350e6)
+ odb: use size_t for object_info.sizep and the size APIs
+ packfile,delta: drop the cast_size_t_to_ulong() wrappers
+ pack-objects: use size_t for in-core object sizes
+ packfile: widen unpack_entry()'s size out-parameter to size_t
+ pack-objects(check_pack_inflate()): use size_t instead of unsigned long
+ patch-delta: use size_t for sizes
+ compat/msvc: use _chsize_s for ftruncate

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* kw/gitattributes-typofix (2026-06-15) 1 commit (merged to 'next' on 2026-06-17 at 14ff167ef8)
+ gitattributes: fix eol attribute for Perl scripts

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* rs/cat-file-default-format-optim (2026-06-14) 1 commit (merged to 'next' on 2026-06-17 at 43ed8b3969)
+ cat-file: speed up default format

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* js/parseopt-subcommand-autocorrection (2026-04-27) 11 commits
- SQUASH???
- doc: document autocorrect API
- parseopt: add tests for subcommand autocorrection
- parseopt: enable subcommand autocorrection for git-remote and git-notes
- parseopt: autocorrect mistyped subcommands
- autocorrect: provide config resolution API
- autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT
- autocorrect: use mode and delay instead of magic numbers
- help: move tty check for autocorrection to autocorrect.c
- help: make autocorrect handling reusable
- parseopt: extract subcommand handling from parse_options_step()

The parse-options library learned to auto-correct misspelled subcommand names.

Expecting a reroll.
cf. <[email protected]>
cf. <SY0P300MB0801E50FCB7EB2F45CD15208CE042@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>
source: <SY0P300MB0801677A2A1E0FD38D06A841CE2A2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

* kk/prio-queue-get-put-fusion (2026-06-08) 2 commits
- prio-queue: fold lazy_queue into prio_queue for automatic get+put fusion
- prio-queue: rename .nr to .nr_ and add accessor helpers

The lazy priority queue optimization pattern (deferring actual removal in prio_queue_get() to allow get+put fusion) has been folded directly into prio_queue itself, speeding up commit traversal workflows and simplifying callers.

Needs review.
source: <[email protected]>

* td/ref-filter-memoize-contains (2026-06-12) 3 commits
- commit-reach: die on contains walk errors
- ref-filter: memoize --contains with generations
- commit-reach: reject cycles in contains walk

'git branch --contains' and 'git for-each-ref --contains' have been optimized to use the memoized commit traversal previously used only by 'git tag --contains', significantly speeding up connectivity checks across many candidate refs with shared history.

Needs review.
source: <20260612-ref-filter-memoized-contains-v4-0-5ed39fd001dd@gmail.com>

* tc/replay-linearize (2026-06-16) 4 commits
- SQUASH??? prepare for mm/test-grep-lint
- replay: offer an option to linearize the commit topology
- replay: add helper to put entry into mapped_commits
- replay: refactor enum replay_mode into a bool

git replay learns --linearize option to drop merge commits and linearize the replayed history, mimicking git rebase --no-rebase-merges.

Needs review.
source: <[email protected]>

* ps/setup-drop-global-state (2026-06-10) 8 commits
(merged to 'next' on 2026-06-15 at d9a8b88d47)
+ treewide: drop USE_THE_REPOSITORY_VARIABLE
+ environment: stop using the_repository in is_bare_repository()
+ environment: split up concerns of is_bare_repository_cfg
+ builtin/init: stop modifying is_bare_repository_cfg
+ setup: remove global git_work_tree_cfg variable
+ builtin/init: simplify logic to configure worktree
+ builtin/init: stop modifying global git_work_tree_cfg variable
+ Merge branch 'ps/setup-centralize-odb-creation' into ps/setup-drop-global-state

Continuation of "setup.c" refactoring to drop remaining global state (git_work_tree_cfg, is_bare_repository_cfg). The most notable outcome is that is_bare_repository() has been updated to no longer implicitly rely on the_repository.

Will cook in 'next'.
cf. <airVOrTboNDDGBak@denethor>
cf. <[email protected]>
source: <[email protected]>

* ps/refs-avoid-chdir-notify-reparent (2026-06-19) 11 commits
- refs: drop local buffer in refs_compute_filesystem_location()
- refs: fix recursing get_main_ref_store() with "onbranch" config
- refs/reftable-backend: manually parse "core.sharedRepository"
- refs: move parsing of "core.logAllRefUpdates" back into ref stores
- repository: free main reference database
- chdir-notify: drop unused chdir_notify_reparent()
- refs: unregister reference stores from "chdir_notify"
- setup: don't apply "GIT_REFERENCE_BACKEND" without a repository
- setup: stop applying repository format twice
- setup: inline check_and_apply_repository_format()
- Merge branch 'ps/setup-centralize-odb-creation' into ps/refs-avoid-chdir-notify-reparent

The reference backends have been converted to always use absolute paths internally. This allows dropping the calls to chdir_notify_reparent() and fixes a memory leak in how the reference database is constructed with an "onbranch" condition.

Needs review.
source: <20260619-b4-pks-refs-avoid-chdir-notify-reparent-v4-0-a6472be7acc4@pks.im>

* ps/odb-source-packed (2026-06-16) 18 commits
(merged to 'next' on 2026-06-19 at dcf0c084e4)
+ odb/source-packed: drop pointer to "files" parent source
+ midx: refactor interfaces to work on "packed" source
+ odb/source-packed: stub out remaining functions
+ odb/source-packed: wire up freshen_object() callback
+ odb/source-packed: wire up find_abbrev_len() callback
+ odb/source-packed: wire up count_objects() callback
+ odb/source-packed: wire up for_each_object() callback
+ odb/source-packed: wire up read_object_stream() callback
+ odb/source-packed: wire up read_object_info() callback
+ packfile: use higher-level interface to implement has_object_pack()
+ odb/source-packed: wire up reprepare() callback
+ odb/source-packed: wire up close() callback
+ odb/source-packed: start converting to a proper struct odb_source
+ odb/source-packed: store pointer to "files" instead of generic source
+ packfile: move packed source into "odb/" subsystem
+ packfile: split out packfile list logic
+ packfile: rename struct packfile_store to odb_source_packed
+ Merge branch 'ps/odb-source-loose' into ps/odb-source-packed

The packed object source has been refactored into a proper struct odb_source.

Will cook in 'next'.
cf. <ajK2QKdW-TdflfR0@denethor>
source: <[email protected]>

* td/ref-filter-restore-prefix-iteration (2026-06-12) 1 commit (merged to 'next' on 2026-06-19 at a19dbb4193)
+ ref-filter: restore prefix-scoped iteration

Commands that list branches and tags (like git branch and git tag) have been optimized to pass the namespace prefix when initializing their ref iterator, avoiding a loose-ref scaling regression in repositories with many unrelated loose references.

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* ty/move-protect-hfs-ntfs (2026-06-10) 1 commit
(merged to 'next' on 2026-06-15 at c2a30ca954)
+ environment: move 'protect_hfs' and 'protect_ntfs' into 'repo_config_values'

The global configuration variables protect_hfs and protect_ntfs have been migrated into struct repo_config_values to tie them to per-repository configuration state.

Will cook in 'next'.
cf. <CAP8UFD35Tiy1_fqpjq8P-z=ZhzR3MTiThqfCs977652umRoSEQ@mail.gmail.com> cf. <[email protected]>
source: <[email protected]>

* ps/cat-file-remote-object-info (2026-06-19) 12 commits
- cat-file: make remote-object-info allow-list dynamic
- cat-file: validate remote atoms with allow_list
- cat-file: add remote-object-info to batch-command
- transport: add client support for object-info
- serve: advertise object-info feature
- fetch-pack: move fetch initialization
- connect: refactor packet writing
- fetch-pack: move function to connect.c
- t1006: split test utility functions into new "lib-cat-file.sh"
- cat-file: declare loop counter inside for()
- git-compat-util: add strtoul_ul() with error handling
- transport-helper: fix memory leak of helper on disconnect

The remote-object-info command has been added to git cat-file --batch-command, allowing clients to request object metadata (currently size) from a remote server via protocol v2 without downloading the entire object.

The client dynamically filters format placeholders based on server-advertised capabilities and safely returns empty strings for inapplicable or unsupported fields.

Needs review.
source: <[email protected]>

* ap/http-redirect-wwwauth-fix (2026-06-02) 1 commit
- http: preserve wwwauth_headers across redirects

When cURL follows a redirect, the WWW-Authenticate headers from the redirect target were lost because credential_from_url() cleared the credential state. This has been fixed by preserving the collected headers across the redirect update.

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

* ps/doc-recommend-b4 (2026-06-15) 3 commits
(merged to 'next' on 2026-06-17 at dd9a463369)
+ b4: introduce configuration for the Git project
+ MyFirstContribution: recommend the use of b4
+ MyFirstContribution: recommend shallow threading of cover letters

Project-specific configuration for b4 has been introduced, and the documentation has been updated to recommend using it as a streamlined method for submitting patches.

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* sn/rebase-update-refs-symrefs (2026-06-03) 1 commit
- rebase: skip branch symref aliases

"git rebase --update-refs" has been taught to resolve local branch symrefs to their referents before queuing updates. This correctly skips aliases of the current branch and avoids duplicate updates for underlying real branches, fixing failures when branch aliases (like a default branch rename) are present.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* mm/diff-process-hunks (2026-06-14) 6 commits
- blame: consult diff process for no-hunk detection
- diff: bypass diff process with --no-ext-diff and in format-patch
- diff: add long-running diff process via diff.<driver>.process
- sub-process: separate process lifecycle from hashmap management
- userdiff: add diff.<driver>.process config
- xdiff: support external hunks via xpparam_t

A new diff.<driver>.process configuration has been introduced to allow a long-running external process to act as a hunk provider to allows external tools to control which lines Git considers changed while leaving all output formatting (word diff, color, blame, etc.) to Git's standard pipeline.

Expecting a reroll.
cf. <CAC2Qwm+P=fZOtpfMPeMiSXf3Afk6OLYpTP8Br78_PRA8WNL1Wg@mail.gmail.com> cf. <CAC2Qwm+P=fZOtpfMPeMiSXf3Afk6OLYpTP8Br78_PRA8WNL1Wg@mail.gmail.com>
source: <[email protected]>

* tb/pack-path-walk-bitmap-delta-islands (2026-06-15) 6 commits
- SQUASH???
- pack-objects: support --delta-islands with --path-walk
- pack-objects: extract record_tree_depth() helper
- pack-objects: support reachability bitmaps with --path-walk
- t/perf: drop p5311's lookup-table permutation
- Merge branch 'ds/path-walk-filters' into tb/pack-path-walk-bitmap-delta-islands

The pack-objects command now supports using reachability bitmaps and delta-islands concurrently with the --path-walk option, allowing faster packaging by falling back to path-walk when bitmaps cannot fully satisfy the request.

Waiting for response(s) to review comment(s). cf. <[email protected]> cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* ty/migrate-trust-executable-bit (2026-06-19) 3 commits
- environment: move trust_executable_bit into repo_config_values
- read-cache: move 'ce_mode_from_stat()' to 'read-cache.c'
- read-cache: remove redundant extern declarations

The 'trust_executable_bit' (coming from 'core.filemode' configuration) has been migrated into 'repo_config_values' to tie it to a specific repository instance.

Needs review.
source: <[email protected]>

* kk/prio-queue-cascade-sift (2026-06-01) 1 commit
- prio-queue: use cascade-down for faster extract-min

prio_queue_get() has been optimized by using a cascade-down approach (promoting the smaller child at each level and sifting up the last element from the leaf vacancy), which halves the number of comparisons per extract-min operation in the common case.

Expecting a reroll.
cf. <CAL71e4Ob-B5MJ5DPY+_tzpj6nyrbQ5WutxED2T93SWJV6kJGPA@mail.gmail.com> cf. <CAL71e4MYNiScZjTwkApjDAjRh2LM0_SP59h5HCTywV-Pua03tw@mail.gmail.com>
source: <[email protected]>

* jk/repo-info-path-keys (2026-06-15) 4 commits
- repo: add path.gitdir with absolute and relative suffix formatting
- repo: add path.commondir with absolute and relative suffix formatting
- rev-parse: use append_formatted_path() for path formatting
- path: introduce append_formatted_path() for shared path formatting

The "git repo info" command has been taught new keys to output both absolute and relative paths for "gitdir" and "commondir", supported by a new path-formatting helper extracted from "git rev-parse".

Expecting a reroll.
cf. <CA+rGoLfhhRNrSReeJ1grhy+2K3BSrikTCNgGpCaGqc4fFp3Lfg@mail.gmail.com>
source: <[email protected]>

* ps/history-drop (2026-06-15) 10 commits
- builtin/history: implement "drop" subcommand
- builtin/history: split handling of ref updates into two phases
- reset: stop assuming that the caller passes in a clean index
- reset: allow the caller to specify the current HEAD object
- reset: introduce ability to skip updating HEAD
- reset: introduce dry-run mode
- reset: modernize flags passed to reset_working_tree()
- reset: rename reset_head()
- reset: drop USE_THE_REPOSITORY_VARIABLE
- read-cache: split out function to drop unmerged entries to stage 0

The experimental "git history" command has been taught a new "drop" subcommand to remove a commit and replay its descendants onto its parent.

Needs review.
source: <[email protected]>

* jk/setup-gitfile-diag-fix (2026-06-16) 1 commit (merged to 'next' on 2026-06-18 at b63b3d1f25)
+ read_gitfile(): simplify NOT_A_REPO error message

A regression in the error diagnosis code for invalid .git files has been fixed, avoiding a potential NULL-pointer crash when reporting that a .git file does not point to a valid repository.

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* kh/doc-trailers (2026-06-10) 10 commits
- doc: interpret-trailers: document comment line treatment
- doc: interpret-trailers: commit to “trailer block” term
- doc: interpret-trailers: join new-trailers again
- doc: interpret-trailers: add key format example
- doc: interpret-trailers: explain key format
- doc: interpret-trailers: explain the format after the intro
- doc: interpret-trailers: not just for commit messages
- doc: interpret-trailers: use “metadata” in Name as well
- doc: interpret-trailers: replace “lines” with “metadata”
- doc: interpret-trailers: stop fixating on RFC 822

Documentation updates.

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

* za/completion-hide-dotfiles (2026-05-26) 1 commit
- completion: hide dotfiles for selected path completion

The path completion for commands like git rm and git mv, is being updated to hide dotfiles by default, unless the user explicitly starts the path with a dot, matching standard shell-completion behavior.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* ec/commit-fixup-options (2026-05-26) 2 commits
- commit: allow -c/-C for all kinds of --fixup
- commit: allow -m/-F for all kinds of --fixup

The -m/-F/-c/-C options to supply commit log message from outside the editor are now supported for all "git commit --fixup" variations.

Needs review.
source: <[email protected]>

* kh/doc-replay-config (2026-06-05) 4 commits
- doc: replay: move “default” to the right-hand side
- doc: replay: use a nested description list
- doc: replay: improve config description
- doc: link to config for git-replay(1)

Doc update for "git replay" to actually refer to its configuration variables.

Needs review.
source: <[email protected]>

* hn/status-pull-advice-qualified (2026-05-21) 1 commit (merged to 'next' on 2026-06-15 at 898a4df940)
+ remote: qualify "git pull" advice for non-upstream compareBranches

Advice shown by "git status" when the local branch is behind or has diverged from its push branch has been updated to suggest "git pull <remote> <branch>".

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* hn/branch-delete-merged (2026-06-18) 7 commits
- branch: add --dry-run for --delete-merged
- branch: add branch.<name>.deleteMerged opt-out
- branch: add --delete-merged <branch>
- branch: prepare delete_branches for a bulk caller
- branch: let delete_branches skip unmerged branches on bulk refusal
- branch: convert delete_branches() to a flags argument
- branch: add --forked filter for --list mode

"git branch" command learned "--delete-merged" option to remove local branches that have already been merged to the remote-tracking branches they track.

Waiting for response(s) to review comment(s).
cf. <[email protected]> cf. <[email protected]> cf. <[email protected]> cf. <[email protected]>
source: <[email protected]>

* cc/promisor-auto-config-url-more (2026-05-27) 8 commits (merged to 'next' on 2026-06-15 at d1c99e75cc)
+ doc: promisor: improve acceptFromServer entry
+ promisor-remote: auto-configure unknown remotes
+ promisor-remote: trust known remotes matching acceptFromServerUrl
+ promisor-remote: introduce promisor.acceptFromServerUrl
+ promisor-remote: add 'local_name' to 'struct promisor_info'
+ urlmatch: add url_normalize_pattern() helper
+ urlmatch: change 'allow_globs' arg to bool
+ t5710: simplify 'mkdir X' followed by 'git -C X init'

The handling of promisor-remote protocol capability has been loosened to allow the other side to add to the list of promisor remotes via the promisor.acceptFromServerURL configuration variable.

Will cook in 'next'.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* hn/checkout-track-fetch (2026-06-18) 2 commits
- checkout: extend --track with a "fetch" mode to refresh start-point
- branch: expose helpers for finding the remote owning a tracking ref

"git checkout --track=..." learned to optionally fetch the branch from the remote the new branch will work with.

Needs review.
source: <[email protected]>

* en/ort-harden-against-corrupt-trees (2026-06-13) 5 commits (merged to 'next' on 2026-06-18 at e51bee59ca)
+ cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts
+ merge-ort: abort merge when trees have duplicate entries
+ merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()
+ merge-ort: drop unnecessary show_all_errors from collect_merge_info()
+ merge-ort: propagate callback errors from traverse_trees_wrapper()

"ort" merge backend handles merging corrupt trees better by aborting when it should.

Will cook in 'next'.
cf. <[email protected]>
source: <[email protected]>

* pw/status-rebase-todo (2026-05-01) 2 commits
- status: improve rebase todo list parsing
- sequencer: factor out parsing of todo commands

The display of the rebase todo list in "git status" has been improved to correctly abbreviate object IDs for more commands and avoid misinterpreting refs as object IDs.

Waiting for response(s) to review comment(s). cf. <[email protected]>
source: <[email protected]>

* cl/conditional-config-on-worktree-path (2026-05-24) 2 commits
- config: add "worktree" and "worktree/i" includeIf conditions
- config: refactor include_by_gitdir() into include_by_path()

The [includeIf "condition"] conditional inclusion facility for configuration files has learned to use the location of worktree in its condition.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* ps/shift-root-in-graph (2026-06-13) 2 commits
- graph: indent visual root in graph
- lib-log-graph: move check_graph function

"git log --graph" has been modified to visually distinguish parentless "root" commits (and commits that become roots due to history simplification) by indenting them, preventing them from appearing falsely related to unrelated commits rendered immediately above them.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

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

* kk/fetch-store-ref-optimization (2026-05-24) 1 commit . fetch: pass transport to post-fetch connectivity check

When fetching from a transport that provides a self-contained pack, pass the transport pointer to the post-fetch check_connected() call to optimize connectivity check.

Retracted.
cf. <CAL71e4MrVqC1=AR6x0_8S=8kVqPdDkhgCZRb4etFsxTzd6s_8Q@mail.gmail.com>
source: <[email protected]>

* lp/repack-propagate-promisor-debugging-info (2026-04-18) 6 commits . repack-promisor: add missing headers
. t7703: test for promisor file content after geometric repack . t7700: test for promisor file content after repack
. repack-promisor: preserve content of promisor files after repack . repack-promisor add helper to fill promisor file after repack . pack-write: add explanation to promisor file content

When fetching objects into a lazily cloned repository, .promisor files are created with information meant to help debugging. "git repack" has been taught to carry this information forward to packfiles that are newly created.

Retracted.
cf. <agx_GPfBKpkSc3Gx@lorenzo-VM>
source: <[email protected]>

* cs/subtree-split-recursion (2026-03-05) 3 commits . contrib/subtree: reduce recursion during split . contrib/subtree: functionalize split traversal . contrib/subtree: reduce function side-effects

When processing large history graphs on Debian or Ubuntu, "git subtree" can die with a "recursion depth reached" error.

Retracted.
cf. <[email protected]>
source: <20260305-cs-subtree-split-recursion-v2-0-7266be870ba9@howdoi.land>

* jc/neuter-sideband-post-3.0 (2026-03-05) 2 commits
. sideband: delay sanitizing by default to Git v3.0
. Merge branch 'jc/neuter-sideband-fixup' into jc/neuter-sideband-post-3.0

The final step, split from earlier attempt by Dscho, to loosen the sideband restriction for now and tighten later at Git v3.0 boundary.

Retracted.
cf. <[email protected]>
source: <[email protected]>

* kk/remove-get-reachable-subset (2026-06-11) 1 commit . commit-reach: remove get_reachable_subset()

API clean-up.

Retracted.
cf. <CAL71e4P3Oq08xVPZ+dxQ8L5PKekPJN0RsL4pTicom1og7-1D=A@mail.gmail.com>
source: <[email protected]>

* ds/config-no-includes (2026-06-08) 3 commits
. git: add --no-includes top-level option
. config: add GIT_CONFIG_INCLUDES
. git-config.adoc: fix paragraph break

Two new mechanisms, the GIT_CONFIG_INCLUDES environment variable and the top-level --no-includes command-line option, have been introduced to ignore configuration include directives.

Retracted.
cf. <[email protected]>
source: <[email protected]>

#1 lore raw
Quoted 9 lines · Junio C Hamano

* ps/gitlab-ci-windows (2026-06-15) 1 commit
- gitlab-ci: migrate Windows builds away from Chocolatey

Wean the Windows builds in GitLab CI procedure away from (unfortunately unreliable) Chocolatey to install dependencies.

Will merge to 'next'?
cf. <ajL1677NQShTO6tD@denethor>
source: <20260615-b4-pks-gitlab-ci-drop-chocolatey-v1-1-51a6e7d5e388@pks.im>

Yeah, this topic is ready, and I'm very much looking forward to this fix. This flake has been extremely annoying over the last couple weeks. Might even be a candidate to also merge to master before the release, if you feel comfortable with that.

Thanks!

Patrick

#2 lore raw
Quoted 6 lines · Patrick Steinhardt
Quoted 3 lines · Junio C Hamano

* ps/gitlab-ci-windows (2026-06-15) 1 commit
- gitlab-ci: migrate Windows builds away from Chocolatey
...

Might even be a candidate to also merge to master before the release, if you feel comfortable with that.

Yeah, exactly my thought. I've carelessly merged some stuff that had wider implications (I do not think they are buggy after reading the patches, though) than the topic name suggested near the tip of 'master' recently, but compared to them the potential blast radius of this topic is certainly much smaller ;-)