Skip to contentSkip to conversation

What's cooking in git.git (Mar 2026, #08)

DISCUSSION Junio C Hamano 5 participants 8 messages Mar 22 – Mar 23

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

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/

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

* jk/diff-highlight-identical-pairs (2026-03-17) 1 commit (merged to 'next' on 2026-03-20 at a8aa5bd14e)
+ contrib/diff-highlight: do not highlight identical pairs (this branch is used by jk/diff-highlight-more.)

The handling of the incomplete lines at the end by "git diff-highlight" has been fixed.

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

* jk/diff-highlight-more (2026-03-19) 9 commits
- diff-highlight: fetch all config with one process
- diff-highlight: allow module callers to pass in color config
- diff-highlight: test color config
- diff-highlight: use test_decode_color in tests
- t: add matching negative attributes to test_decode_color
- diff-highlight: check diff-highlight exit status in tests
- diff-highlight: drop perl version dependency back to 5.8
- diff-highlight: mention build instructions
- Merge branch 'jk/diff-highlight-identical-pairs' into jk/diff-highlight-more (this branch uses jk/diff-highlight-identical-pairs.)

Various updates to contrib/diff-highlight, including documentation updates, test improvements, and color configuration handling.

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

* js/macos-homebrew-forgets-reg-enhanced (2026-03-20) 1 commit
- osx-clang: work around Homebrew's clang lacking REG_ENHANCED

The build on macOS with Clang is fixed to work around a Homebrew change that exposed an issue with missing REG_ENHANCED.

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

* ps/fsck-wo-the-repository (2026-03-20) 14 commits
- builtin/fsck: stop using the_repository in error reporting
- fsck: provide repository in struct fsck_report_object
- builtin/fsck: stop using the_repository when marking objects
- builtin/fsck: stop using the_repository when checking packed objects
- builtin/fsck: stop using the_repository with loose objects
- builtin/fsck: stop using the_repository when checking reflogs
- builtin/fsck: stop using the_repository when checking refs
- builtin/fsck: stop using the_repository when snapshotting refs
- builtin/fsck: fix trivial dependence on the_repository
- fsck: stop relying on global state via parse_oid_hex()
- fsck: drop the_repository in fsck_set_msg_types()
- fsck: refactor interface to parse fsck options
- fsck: drop the_repository in fsck_finish()
- fsck: drop the_repository in fsck_walk()

Internals of "git fsck" have been refactored to not depend on the global the_repository variable.

Comments?
source: <20260320-b4-pks-fsck-without-the-repository-v1-0-6594f997926b@pks.im>

* tb/stdin-packs-excluded-but-open (2026-03-19) 5 commits
- repack: mark non-MIDX packs above the split as excluded-open
- pack-objects: support excluded-open packs with --stdin-packs
- t7704: demonstrate failure with once-cruft objects above the geometric split
- pack-objects: refactor read_packs_list_from_stdin() to use strmap
- pack-objects: plug leak in read_stdin_packs()

pack-objects's --stdin-packs=follow mode learns to handle excluded-but-open packs.

Comments?
source: <[email protected]>

* yc/path-walk-fix-error-reporting (2026-03-20) 1 commit
- path-walk: fix NULL pointer dereference in error message

The value of a wrong pointer variable was referenced in an error message that reported that it shouldn't be NULL.

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

* jr/bisect-custom-terms-in-output (2026-03-20) 1 commit
- bisect: use selected alternate terms in status output

"git bisect" now uses the selected terms (e.g., old/new) more consistently in its output.

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

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

* jc/whitespace-incomplete-line (2026-03-17) 1 commit
- apply: fix new-style empty context line triggering incomplete-line check

Fix whitespace correction for new-style empty context lines.

Needs review.
source: <[email protected]>

* sp/add-patch-with-fewer-the-repository (2026-03-17) 1 commit
- add-patch: use repository instance from add_i_state instead of the_repository

Reduce dependency on the_repository in add-patch.c file.

Needs review.
source: <[email protected]>

* ds/backfill-revs (2026-03-16) 5 commits
- path-walk: support wildcard pathspecs for blob filtering
- backfill: work with prefix pathspecs
- backfill: accept revision arguments
- t5620: prepare branched repo for revision tests
- revision: include object-name.h

git backfill learned to accept revision and pathspec arguments.

Needs review.
source: <[email protected]>

* jw/t2203-status-pipe-fix (2026-03-16) 1 commit
- t2203: avoid suppressing git status exit code

Test clean-up.

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

* ps/commit-graph-overflow-fix (2026-03-17) 1 commit
- commit-graph: fix writing generations with dates exceeding 34 bits

Fix a regression in writing the commit-graph where commits with dates exceeding 34 bits (beyond year 2514) could cause an underflow and crash Git during the generation data overflow chunk writing.

Needs review.
source: <[email protected]>

* tc/replay-down-to-root (2026-03-17) 1 commit
- replay: support replaying down from root commit

git replay now supports replaying down to the root commit.

Needs review.
source: <[email protected]>

* mr/merge-file-object-id-worktree-fix (2026-03-10) 1 commit (merged to 'next' on 2026-03-20 at 68e1ee2045)
+ merge-file: fix BUG when --object-id is used in a worktree

merge-file --object-id used to trigger a BUG when run in a linked worktree, which has been fixed.

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

* rs/prio-queue-to-commit-stack (2026-03-17) 1 commit (merged to 'next' on 2026-03-20 at 265cb7b28c)
+ use commit_stack instead of prio_queue in LIFO mode

Uses of prio_queue as a LIFO stack of commits have been written with commit_stack.

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

* jw/object-name-bitset-to-enum (2026-03-18) 1 commit
- object-name: turn INTERPRET_BRANCH_* constants into enum values

The unsigned integer that is used as an bitset to specify the kind of branches interpret_branch_name() function has been changed to use a dedicated enum type.

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

* ai/t2107-test-path-is-helpers (2026-03-18) 1 commit
- t2107: modernize path existence check

Test cleanup.

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

* gi/doc-boolean-config-typofix (2026-03-18) 1 commit (merged to 'next' on 2026-03-20 at 8810624798)
+ doc: add missing space on git-config page

Doc typofix.

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

* ua/push-remote-group (2026-03-18) 2 commits
- push: support pushing to a remote group
- remote: move remote group resolution to remote.c

"git push" learned to take a "remote group" name to push to, which causes pushes to multiple places, just like "git fetch" would do.

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

* jc/rerere-modern-strbuf-handling (2026-03-19) 2 commits (merged to 'next' on 2026-03-21 at 919b766afc)
+ cocci: strbuf.buf is never NULL
+ rerere: update to modern representation of empty strbufs

Code clean-up overdue by 19 years.

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

* ps/odb-generic-object-name-handling (2026-03-20) 15 commits
- odb: introduce generic odb_find_abbrev_len()
- object-file: move logic to compute packed abbreviation length
- object-name: move logic to compute loose abbreviation length
- object-name: simplify computing common prefixes
- object-name: abbreviate loose object names without disambiguate_state
- object-name: merge update_candidates() and match_prefix()
- object-name: backend-generic get_short_oid()
- object-name: backend-generic repo_collect_ambiguous()
- object-name: extract function to parse object ID prefixes
- object-name: move logic to iterate through packed prefixed objects
- object-name: move logic to iterate through loose prefixed objects
- odb: introduce struct odb_for_each_object_options
- oidtree: extend iteration to allow for arbitrary return codes
- oidtree: modernize the code a bit
- Merge branch 'ps/object-counting' into ps/odb-generic-object-name-handling (this branch uses ps/object-counting.)

Object name handling (disambiguation and abbreviation) has been refactored to be backend-generic, moving logic into the respective object database backends.

Comments?
source: <[email protected]>

* rs/ahead-behind-cleanup-optimization (2026-03-19) 1 commit (merged to 'next' on 2026-03-21 at 5d8b4fa265)
+ commit-reach: simplify cleanup of remaining bitmaps in ahead_behind ()

The cleanup of remaining bitmaps in "ahead_behind()" has been simplified.

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

* bk/t5315-test-path-is-helpers (2026-03-19) 1 commit
- t5315: use test_path_is_file for loose-object check

Test clean-up.

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

* rs/split-index-the-repo-fix (2026-03-19) 1 commit (merged to 'next' on 2026-03-21 at d66850b2ce)
+ split-index: stop using the_repository and the_hash_algo

split-index.c has been updated to not use the global the_repository and the_hash_algo variables.

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

* aa/reap-transport-child-processes (2026-03-12) 1 commit
. transport-helper, connect: use clean_on_exit to reap children on abnormal exit

A few code paths that spawned child processes for network connection weren't wait(2)ing for their children and letting "init" reap them instead; they have been tightened.

CI failures on Windows in t0061.24?
cf. <[email protected]>
source: <[email protected]>

* ss/t0410-delete-object-cleanup (2026-03-12) 1 commit (merged to 'next' on 2026-03-17 at a8d41f4c1f)
+ t0410: modernize delete_object helper

Test clean-up.

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

* ej/ref-transaction-hook-preparing (2026-03-16) 1 commit (merged to 'next' on 2026-03-20 at f9b8fbb0dc)
+ refs: add 'preparing' phase to the reference-transaction hook

The reference-transaction hook was taught to be triggered before taking locks on references in the "preparing" phase.

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

* hn/git-checkout-m-with-stash (2026-03-17) 4 commits
- checkout: -m (--merge) uses autostash when switching branches
- sequencer: teach autostash apply to take optional conflict marker labels
- sequencer: allow create_autostash to run silently
- stash: add --ours-label, --theirs-label, --base-label for apply

"git checkout -m another-branch" was invented to deal with local changes to paths that are different between the current and the new branch, but it gave only one chance to resolve conflicts. The command was taught to create a stash to save the local changes.

Needs review.
source: <[email protected]>

* kh/name-rev-custom-format (2026-03-20) 2 commits
- name-rev: learn --format=<pretty>
- name-rev: wrap both blocks in braces

"git name-rev" learned to use custom format instead of the object name in an extended SHA-1 expression form.

Comments?
source: <[email protected]>

* pw/worktree-reduce-the-repository (2026-03-15) 3 commits
- worktree: reject NULL worktree in get_worktree_git_dir()
- worktree add: stop reading ".git/HEAD"
- worktree: remove "the_repository" from is_current_worktree()

Reduce the reference to the_repository in the worktree subsystem.

Expecting review responses.
cf. <[email protected]>
source: <[email protected]>

* dd/cocci-do-not-pass-strbuf-by-value (2026-03-15) 3 commits
(merged to 'next' on 2026-03-18 at a2ffed1127)
+ stash: do not pass strbuf by value
+ coccinelle: detect struct strbuf passed by value
+ Merge branch 'dd/list-objects-filter-options-wo-strbuf-split' into dd/cocci-do-not-pass-strbuf-by-value

Add a coccinelle rule to break the build when "struct strbuf" gets passed by value.

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

* gj/user-manual-fix-grep-example (2026-03-16) 1 commit (merged to 'next' on 2026-03-17 at dbf9137a9d)
+ doc: fix git grep args order in Quick Reference

Fix an example in the user-manual.

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

* jk/transport-color-leakfix (2026-03-14) 1 commit (merged to 'next' on 2026-03-17 at c2d7c74d11)
+ transport: plug leaks in transport_color_config()

Leakfix.

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

* jw/apply-corrupt-location (2026-03-17) 3 commits
- apply: report input location in binary and garbage patch errors
- apply: report input location in header parsing errors
- apply: report the location of corrupt patches

"git apply" now reports the name of the input file along with the line number when it encounters a corrupt patch, and correctly resets the line counter when processing multiple patch files.

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

* ps/clar-wo-path-max (2026-03-16) 1 commit
(merged to 'next' on 2026-03-17 at 1d2f28a677)
+ clar: update to fix compilation on platforms without PATH_MAX

Clar (unit testing framework) update from the upstream.

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

* rj/pack-refs-tests-path-is-helpers (2026-03-15) 1 commit (merged to 'next' on 2026-03-17 at 56374095e3)
+ t/pack-refs-tests: use test_path_is_missing

Test updates.

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

* mf/format-patch-commit-list-format (2026-03-19) 9 commits
- format-patch: --commit-list-format without prefix
- format-patch: add preset for --commit-list-format
- format-patch: wrap generate_commit_list_cover()
- format.commitListFormat: strip meaning from empty
- docs/pretty-formats: add %(count) and %(total)
- format-patch: rename --cover-letter-format option
- format-patch: refactor generate_commit_list_cover
- pretty.c: better die message %(count) and %(total)
- Merge branch 'mf/format-patch-cover-letter-format' into mf/format-patch-commit-list-format (this branch uses mf/format-patch-cover-letter-format.)

Improve the recently introduced git format-patch --commit-list-format (formerly --cover-letter-format) option, including a new "modern" preset and better CLI ergonomics.

Comments?
source: <[email protected]>

* mf/t0008-cleanup (2026-03-15) 1 commit (merged to 'next' on 2026-03-17 at 2bb0e51243)
+ t0008: improve test cleanup to fix failing test

Test clean-up.

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

* pb/t4200-test-path-is-helpers (2026-03-16) 1 commit (merged to 'next' on 2026-03-17 at a78771f93e)
+ t4200: convert test -[df] checks to test_path_* helpers

Test clean-up.

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

* js/parseopt-subcommand-autocorrection (2026-03-16) 10 commits
- 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 review responses.
cf. <[email protected]>
source: <SY0P300MB080186A23FB9582AD793F0D1CE40A@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

* jt/fast-import-sign-again (2026-03-12) 3 commits (merged to 'next' on 2026-03-17 at e04808d5f2)
+ fast-import: add mode to sign commits with invalid signatures
+ gpg-interface: allow sign_buffer() to use default signing key
+ commit: remove unused forward declaration

"git fast-import" learned to optionally replace signature on commits whose signatures get invalidated due to replaying by signing afresh.

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

* mf/apply-p-no-atoi (2026-03-15) 1 commit
(merged to 'next' on 2026-03-20 at 70a0a4313b)
+ apply.c: fix -p argument parsing

"git apply -p<n>" parses <n> more carefully now.

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

* ps/build-tweaks (2026-03-18) 8 commits
(merged to 'next' on 2026-03-20 at fb53cf619a)
+ meson: precompile "git-compat-util.h"
+ meson: compile compatibility sources separately
+ git-compat-util.h: move warning infra to prepare for PCHs
+ builds: move build scripts into "tools/"
+ contrib: move "update-unicode.sh" script into "tools/"
+ contrib: move "coverage-diff.sh" script into "tools/"
+ contrib: move "coccinelle/" directory into "tools/"
+ Introduce new "tools/" directory

Tweak the build infrastructure by moving tools around.

Will merge to 'master'.
source: <20260319-b4-pks-build-infra-improvements-v3-0-82f5fb3edc3f@pks.im>

* ps/object-counting (2026-03-19) 8 commits
- object-file: fix sparse 'plain integer as NULL pointer' error (merged to 'next' on 2026-03-17 at 8d3d9a1374)
+ odb: introduce generic object counting
+ odb/source: introduce generic object counting
+ object-file: generalize counting objects
+ object-file: extract logic to approximate object count
+ packfile: extract logic to count number of objects
+ odb: stop including "odb/source.h"
+ Merge branch 'ps/odb-sources' into ps/object-counting (this branch is used by ps/odb-generic-object-name-handling.)

The logic to count objects has been cleaned up.

Will merge to 'next' and then to 'master'.
source: <20260312-b4-pks-odb-source-count-objects-v2-0-5914f69256bf@pks.im>

* ty/doc-diff-u-wo-number (2026-03-10) 1 commit (merged to 'next' on 2026-03-18 at 8a410154ff)
+ diff: document -U without <n> as using default context

"git diff -U<num>" was too lenient in its command line parsing and took an empty string as a valid <num>.

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

* ms/t7605-test-path-is-helpers (2026-03-10) 1 commit (merged to 'next' on 2026-03-16 at 49facdec9f)
+ t7605: use test_path_is_file instead of test -f

Test updates.

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

* bb/imap-send-openssl-4.0-prep (2026-03-11) 3 commits (merged to 'next' on 2026-03-16 at 0baab97778)
+ imap-send: move common code into function host_matches()
+ imap-send: use the OpenSSL API to access the subject common name
+ imap-send: use the OpenSSL API to access the subject alternative names

"imap-send" used to use functions whose use is going to be removed with OpenSSL 4.0; rewrite them using public API that has been available since OpenSSL 1.1 since 2016 or so.

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

* jc/test-allow-sed-with-ere (2026-03-11) 1 commit (merged to 'next' on 2026-03-16 at be057bed35)
+ t: allow use of "sed -E"

Adjust test-lint to allow "sed -E" to use ERE in the patterns.

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

* kh/doc-interpret-trailers-1 (2026-03-16) 4 commits (merged to 'next' on 2026-03-20 at 6acc8b5a8a)
+ interpret-trailers: use placeholder instead of *
+ doc: config: convert trailers section to synopsis style
+ doc: interpret-trailers: normalize and fill out options
+ doc: interpret-trailers: convert to synopsis style

Doc updates.

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

* ty/mktree-wo-the-repository (2026-03-12) 1 commit (merged to 'next' on 2026-03-16 at 8d20ceb853)
+ builtin/mktree: remove USE_THE_REPOSITORY_VARIABLE

Code clean-up.

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

* mm/line-log-use-standard-diff-output (2026-03-16) 4 commits
- doc: note that -L supports patch formatting and pickaxe options
- t4211: add tests for -L with standard diff options
- line-log: route -L output through the standard diff pipeline
- line-log: fix crash when combined with pickaxe options

The way the "git log -L<range>:<file>" feature is bolted onto the log/diff machinery is being reworked a bit to make the feature compatible with more diff options, like -S/G.

Needs review.
source: <[email protected]>

* ar/config-hook-cleanups (2026-03-20) 11 commits
- hook: show disabled hooks in "git hook list"
- hook: show config scope in git hook list
- hook: introduce hook_config_cache_entry for per-hook data
- t1800: add test to verify hook execution ordering
- hook: make consistent use of friendly-name in docs
- hook: replace hook_list_clear() -> string_list_clear_func()
- hook: detect & emit two more bugs
- hook: rename cb_data_free/alloc -> hook_data_free/alloc
- hook: fix minor style issues
- hook: move unsorted_string_list_remove() to string-list.[ch]
- Merge branch 'ar/config-hooks' into ar/config-hook-cleanups (this branch is used by ar/parallel-hooks.)

Code clean-up around the recent "hooks defined in config" topic.

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

* cf/constness-fixes (2026-03-08) 2 commits (merged to 'next' on 2026-03-13 at 3c80964399)
+ dir: avoid -Wdiscarded-qualifiers in remove_path()
+ bloom: remove a misleading const qualifier

Small code clean-up around the constness area.

Will merge to 'master'.
source: <3ad40c3d0762c2e8c14792dfb68cba9f63a883a3.1773026586.git.collin.funk1@gmail.com>

* ab/clone-default-object-filter (2026-03-14) 1 commit
- clone: add clone.<url>.defaultObjectFilter config

"git clone" learns to pay attention to "clone.<url>.defaultObjectFilter" configuration and behave as if the "--filter=<filter-spec>" option was given on the command line.

Expecting review responses.
cf. <[email protected]>
source: <[email protected]>

* jc/neuter-sideband-fixup (2026-03-05) 6 commits
(merged to 'next' on 2026-03-13 at 5a4098b0cd)
+ sideband: drop 'default' configuration
+ sideband: offer to configure sanitizing on a per-URL basis
+ sideband: add options to allow more control sequences to be passed through
+ sideband: do allow ANSI color sequences by default
+ sideband: introduce an "escape hatch" to allow control characters
+ sideband: mask control characters
(this branch is used by jc/neuter-sideband-post-3.0.)

Try to resurrect and reboot a stalled "avoid sending risky escape sequences taken from sideband to the terminal" topic by Dscho. The plan is to keep it in 'next' long enough to see if anybody screams with the "everything dropped except for ANSI color escape sequences" default.

Will keep in 'next' a bit longer than usual.
source: <[email protected]>

* 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 (this branch uses jc/neuter-sideband-fixup.)

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

On hold, until jc/neuter-sideband-fixup cooks long enough in 'next'. (this branch uses jc/neuter-sideband-fixup.)
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.

Comments?
source: <20260305-cs-subtree-split-recursion-v2-0-7266be870ba9@howdoi.land>

* ps/history-split (2026-03-02) 8 commits
(merged to 'next' on 2026-03-17 at 456723f018)
+ builtin/history: implement "split" subcommand
+ builtin/history: split out extended function to create commits
+ cache-tree: allow writing in-memory index as tree
+ add-patch: allow disabling editing of hunks
+ 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"

"git history" learned the "split" subcommand.

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

* pt/promisor-lazy-fetch-no-recurse (2026-03-11) 1 commit
- promisor-remote: prevent lazy-fetch recursion in child fetch

The mechanism to avoid recursive lazy-fetch from promisor remotes was not propagated properly to child "git fetch" processes, which has been corrected.

Comments?
source: <[email protected]>

* ps/upload-pack-buffer-more-writes (2026-03-12) 10 commits (merged to 'next' on 2026-03-18 at 138ad42ac5)
+ builtin/pack-objects: reduce lock contention when writing packfile data
+ csum-file: drop hashfd_throughput()
+ csum-file: introduce hashfd_ext()
+ sideband: use writev(3p) to send pktlines
+ wrapper: introduce writev(3p) wrappers
+ compat/posix: introduce writev(3p) wrapper
+ upload-pack: reduce lock contention when writing packfile data
+ upload-pack: prefer flushing data over sending keepalive
+ upload-pack: adapt keepalives based on buffering
+ upload-pack: fix debug statement when flushing packfile data

Reduce system overhead "git upload-pack" spends on relaying "git pack-objects" output to the "git fetch" running on the other end of the connection.

Will merge to 'master'.
source: <20260313-pks-upload-pack-write-contention-v4-0-7a9668061f7f@pks.im>

* mf/format-patch-cover-letter-format (2026-03-06) 5 commits (merged to 'next' on 2026-03-09 at e872adca7b)
+ docs: add usage for the cover-letter fmt feature
+ format-patch: add commitListFormat config
+ format-patch: add ability to use alt cover format
+ format-patch: move cover letter summary generation
+ pretty.c: add %(count) and %(total) placeholders (this branch is used by mf/format-patch-commit-list-format.)

"git format-patch --cover-letter" learns to use a simpler format instead of the traditional shortlog format to list its commits with a new --cover-letter-format option and format.commitListFormat configuration variable.

Waiting for the follow-on topic.
source: <[email protected]>

* pt/fsmonitor-linux (2026-03-04) 12 commits
- fsmonitor: convert shown khash to strset in do_handle_client
- fsmonitor: add tests for Linux
- fsmonitor: add timeout to daemon stop command
- fsmonitor: close inherited file descriptors and detach in daemon
- run-command: add close_fd_above_stderr option
- fsmonitor: implement filesystem change listener for Linux
- fsmonitor: rename fsm-settings-darwin.c to fsm-settings-unix.c
- fsmonitor: rename fsm-ipc-darwin.c to fsm-ipc-unix.c
- fsmonitor: use pthread_cond_timedwait for cookie wait
- compat/win32: add pthread_cond_timedwait
- fsmonitor: fix hashmap memory leak in fsmonitor_run_daemon
- fsmonitor: fix khash memory leak in do_handle_client

The fsmonitor daemon has been implemented for Linux.

Waiting for the rerolls to slow down?
cf. <[email protected]>
source: <[email protected]>

* ac/help-sort-correctly (2026-03-11) 1 commit
(merged to 'next' on 2026-03-16 at db220e143f)
+ help: cleanup the contruction of keys_uniq

The code in "git help" that shows configuration items in sorted order was awkwardly organized and prone to bugs.

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

* sa/replay-revert (2026-03-12) 2 commits
- replay: add --revert mode to reverse commit changes
- sequencer: extract revert message formatting into shared function

"git replay" (experimental) learns, in addition to "pick" and "replay", a new operating mode "revert".

Expecting review responses.
cf. <[email protected]>
source: <[email protected]>

* vp/http-rate-limit-retries (2026-03-17) 3 commits
- http: add support for HTTP 429 rate limit retries
- strbuf_attach: fix call sites to pass correct alloc
- strbuf: pass correct alloc to strbuf_attach() in strbuf_reencode()

The HTTP transport learned to react to "429 Too Many Requests".

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

* ar/parallel-hooks (2026-03-20) 11 commits
- hook: add hook.<event>.enabled switch
- hook: warn when hook.<friendly-name>.jobs is set
- hook: add per-event jobs config
- hook: add -j/--jobs option to git hook run
- hook: mark non-parallelizable hooks
- hook: allow pre-push parallel execution
- hook: allow parallel hook execution
- hook: parse the hook.jobs config
- config: add a repo_config_get_uint() helper
- repository: fix repo_init() memleak due to missing _clear()
- Merge branch 'ar/config-hook-cleanups' into ar/parallel-hooks (this branch uses ar/config-hook-cleanups.)

Needs review.
source: <[email protected]>

* ng/submodule-default-remote (2026-03-03) 1 commit (merged to 'next' on 2026-03-16 at d41fd28450)
+ submodule: fetch missing objects from default remote

Instead of hardcoded 'origin', use the configured default remote when fetching from submodules.

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

* yc/histogram-hunk-shift-fix (2026-03-02) 1 commit
(merged to 'next' on 2026-03-18 at 5e49edc821)
+ xdiff: re-diff shifted change groups when using histogram algorithm

The final clean-up phase of the diff output could turn the result of histogram diff algorithm suboptimal, which has been corrected.

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

* en/xdiff-cleanup-3 (2026-01-03) 11 commits
. SQUASH??? cocci
. xdiff: move xdl_cleanup_records() from xprepare.c to xdiffi.c . xdiff: remove dependence on xdlclassifier from xdl_cleanup_records() . xdiff: replace xdfile_t.dend with xdfenv_t.delta_end
. xdiff: replace xdfile_t.dstart with xdfenv_t.delta_start . xdiff: cleanup xdl_trim_ends()
. xdiff: use xdfenv_t in xdl_trim_ends() and xdl_cleanup_records() . xdiff: let patience and histogram benefit from xdl_trim_ends() . xdiff: don't waste time guessing the number of lines
. xdiff: make classic diff explicit by creating xdl_do_classic_diff() . ivec: introduce the C side of ivec

Preparation of the xdiff/ codebase to work with Rust

Expecting a reroll.
cf. <CAH=ZcbBVSqUG89n65MBpN+HMCmmjzmADGaVnuEJn_cYN0SYknw@mail.gmail.com>
source: <[email protected]>

* tb/incremental-midx-part-3.2 (2026-02-24) 17 commits (merged to 'next' on 2026-03-18 at 7f995e23bb)
+ midx: enable reachability bitmaps during MIDX compaction
+ midx: implement MIDX compaction
+ t/helper/test-read-midx.c: plug memory leak when selecting layer
+ midx-write.c: factor fanout layering from compute_sorted_entries()
+ midx-write.c: enumerate pack_int_id values directly
+ midx-write.c: extract fill_pack_from_midx()
+ midx-write.c: introduce midx_pack_perm() helper
+ midx: do not require packs to be sorted in lexicographic order
+ midx-write.c: introduce struct write_midx_opts
+ midx-write.c: don't use pack_perm when assigning bitmap_pos
+ t/t5319-multi-pack-index.sh: fix copy-and-paste error in t5319.39
+ git-multi-pack-index(1): align SYNOPSIS with 'git multi-pack-index -h'
+ git-multi-pack-index(1): remove non-existent incompatibility
+ builtin/multi-pack-index.c: make '--progress' a common option
+ midx: introduce midx_get_checksum_hex()
+ midx: rename get_midx_checksum() to midx_get_checksum_hash()
+ midx: mark get_midx_checksum() arguments as const

Further work on incremental repacking using MIDX/bitmap

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

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

* js/neuter-sideband (2026-02-03) 6 commits
. sideband: delay sanitizing by default to Git v3.0
. sideband: offer to configure sanitizing on a per-URL basis
. sideband: add options to allow more control sequences to be passed through . sideband: do allow ANSI color sequences by default
. sideband: introduce an "escape hatch" to allow control characters . sideband: mask control characters

Invalidate control characters in sideband messages, to avoid terminal state getting messed up.

Superseded by 'jc/neuter-sideband-fixup', which reuses most of the patches. cf. <[email protected]>
source: <[email protected]>

* bc/rev-parse-parseopt-help-exit-code (2026-03-16) 1 commit . rev-parse: have --parseopt callers exit 0 on --help

rev-parse --parseopt now includes "exit 0" in its output when the user asks for help, ensuring that scripts using the recommended eval pattern exit successfully.

Need to step back and rethink how exit code should look like. cf. <[email protected]>
source: <[email protected]>

#1 lore raw
Quoted 9 lines

- sp/add-patch-with-fewer-the-repository (2026-03-17) 1 commit

* add-patch: use repository instance from add_i_state instead of the_repository

Reduce dependency on the_repository in add-patch.c file.

Needs review. source:
<[email protected]>

Hi,

This still references the earlier version, I have sent a reroll after that. Though you fixed the conflicts while merging the old version, commit is not yet replaced <[email protected]>.

Best,
Shreyansh

#3 lore raw
In reply to Junio C Hamano
Quoted 8 lines · Junio C Hamano

* js/macos-homebrew-forgets-reg-enhanced (2026-03-20) 1 commit
- osx-clang: work around Homebrew's clang lacking REG_ENHANCED

The build on macOS with Clang is fixed to work around a Homebrew change that exposed an issue with missing REG_ENHANCED.

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

This seems to no longer be necessary -- the latest workflow run on master succeeded (https://github.com/git/git/actions/runs/23392330338).
Did some kind soul fix the runners?

René

#4 lore raw
Quoted 11 lines · René Scharfe
Quoted 8 lines · Junio C Hamano

* js/macos-homebrew-forgets-reg-enhanced (2026-03-20) 1 commit
- osx-clang: work around Homebrew's clang lacking REG_ENHANCED

The build on macOS with Clang is fixed to work around a Homebrew change that exposed an issue with missing REG_ENHANCED.

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

This seems to no longer be necessary -- the latest workflow run on master succeeded (https://github.com/git/git/actions/runs/23392330338).

Yeah, I saw that too and was wondering if the glitch was reverted or something at the platform side.

Quoted 1 line

Did some kind soul fix the runners?

If so, thanks. It certainly was not me ;-)

#2 lore raw
In reply to Shreyansh Paliwal
Quoted 2 lines · Shreyansh Paliwal

Though you fixed the conflicts while merging the old version, commit is not yet replaced <[email protected]>.

The end result would be better with the initial one after all, as it could be merged down without somebody else's patch you do not need to depend on, so let's keep it as-is. I'll need to replace the status comment, as this has been reviewed and looks good, and it also seems nobody complains about what the patch does.

Thanks.

#7 lore raw
In reply to Junio C Hamano
Quoted 12 lines · Junio C Hamano

* jk/diff-highlight-more (2026-03-19) 9 commits
- diff-highlight: fetch all config with one process
- diff-highlight: allow module callers to pass in color config
- diff-highlight: test color config
- diff-highlight: use test_decode_color in tests
- t: add matching negative attributes to test_decode_color
- diff-highlight: check diff-highlight exit status in tests
- diff-highlight: drop perl version dependency back to 5.8
- diff-highlight: mention build instructions
- Merge branch 'jk/diff-highlight-identical-pairs' into jk/diff-highlight-more (this branch uses jk/diff-highlight-identical-pairs.)

Quoted 5 lines

Various updates to contrib/diff-highlight, including documentation updates, test improvements, and color configuration handling.

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

Hold off on this one, please. There's a missing &&-connector in the test. I'll send out a re-roll, but I'm waiting for a response to the reviewer before doing so (to make sure I am not missing anything more).

-Peff

#5 lore raw
In reply to Junio C Hamano

Hi Junio & René,

Quoted 11 lines · Junio C Hamano
Quoted 9 lines · René Scharfe
Quoted 8 lines · Junio C Hamano

* js/macos-homebrew-forgets-reg-enhanced (2026-03-20) 1 commit
- osx-clang: work around Homebrew's clang lacking REG_ENHANCED

The build on macOS with Clang is fixed to work around a Homebrew change that exposed an issue with missing REG_ENHANCED.

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

Sorry, I missed this side conversation as it happened out-of-thread.

Quoted 5 lines
Quoted 2 lines

This seems to no longer be necessary -- the latest workflow run on master succeeded (https://github.com/git/git/actions/runs/23392330338).

Yeah, I saw that too and was wondering if the glitch was reverted or something at the platform side.

It was reverted at the platform side. The runner-images team rolled back the broken image. Georgy Puzakov (runner-images team member) wrote on 2026-03-20 in
https://github.com/actions/runner-images/issues/13827#issuecomment-4096949778:

"We have some issues with new image version(macOS 15). We made a
rollback version yesterday, can you check if the issue still exists?"

And indeed, the broken macos-14-arm64/20260317.0174 release has been deleted from https://github.com/actions/runner-images/releases -- the latest published macos-14-arm64 release as of time of writing is once again (the last known good one):
https://github.com/actions/runner-images/releases/tag/macos-14-arm64%2F20260302.0147

Quoted 3 lines
Quoted 1 line

Did some kind soul fix the runners?

If so, thanks. It certainly was not me ;-)

Not me either, but I guess nobody earnestly thought that either of us to fix GitHub's Action runners 😁 But I did dig into the root cause, so here is a summary for the record.

The culprit is Homebrew 5.1.0 (released 2026-03-10, announced at
https://brew.sh/2026/03/10/homebrew-5.1.0/), which introduced automatic linking for versioned keg-only formulae when the unversioned sibling is absent (https://github.com/Homebrew/brew/pull/21676). The runner image installs llvm@15 (keg-only) but not unversioned llvm. Under Homebrew 5.1.0, llvm@15 got auto-linked into /opt/homebrew/bin/, and CC=clang silently resolved to Homebrew's LLVM clang instead of Apple's /usr/bin/clang. That LLVM clang does not see the macOS SDK headers, so REG_ENHANCED is undefined and the build fails.

Interestingly, this auto-linking feature was actually reverted within Homebrew itself (https://github.com/Homebrew/brew/pull/21682) and then re-landed with fixes (https://github.com/Homebrew/brew/pull/21684), all before the runner image was even built. So the re-landed version is what shipped in the image.

Which means that the image rollback fixes things for now, but the underlying Homebrew behavior _still_ exists. The next runner image rebuild that picks up Homebrew 5.1.0+ could reintroduce the problem unless the runner-images team pins llvm@15 as keg-only or explicitly unlinks it.

In light of that, the workaround in js/macos-homebrew-forgets-reg-enhanced may still be worth keeping as insurance, even though the immediate breakage has been mitigated by the image rollback. We would be one image refresh away from the same failure otherwise.

Ciao,
Johannes

#6 lore raw
Quoted 5 lines · Johannes Schindelin

And indeed, the broken macos-14-arm64/20260317.0174 release has been deleted from https://github.com/actions/runner-images/releases -- the latest published macos-14-arm64 release as of time of writing is once again (the last known good one):
https://github.com/actions/runner-images/releases/tag/macos-14-arm64%2F20260302.0147

Great to know.

Quoted 5 lines

In light of that, the workaround in js/macos-homebrew-forgets-reg-enhanced may still be worth keeping as insurance, even though the immediate breakage has been mitigated by the image rollback. We would be one image refresh away from the same failure otherwise.

Yes, it will become necessary to resurrect it or something similar when they break it the same way in the future.

The question is where we keep it---I am assuming that forcing build with "clang" to use the compat/ regexp library replacement would not be something we want to do until they break it again, so keeping it forever in 'seen' does not feel quite right (let alone merging it down anywhere near 'next' or 'master'). The lore archive will of course keep it safely and we can retrieve it when it becomes necessary *and* if we remember which patch it was.

Would the best thing we can do here be something like this patch, perhaps?

--- >8 ---
Subject: regexp: leave a pointer to resurrect workaround for Homebrew

Recently some GitHub CI jobs were broken by update on the platform side, which was eventually resolved by image rollback, but in the meantime Dscho invented a workaround patch to sidestep the broken part of the platform. Their future image update may contain the same bug, in which case the workaround may again become needed.

As we do not want to be building with workaround that avoids system regexp library altogether unless the system is known to be broken, so short of an automated "detect broken system and apply workaround" mechanism, let's use the folks who are compiling the code to detect breakage on their system and cope with the breakage ;-)

---
 compat/regcomp_enhanced.c | 5 +++++
 1 file changed, 5 insertions(+)
compat/regcomp_enhanced.c +5 -0
index 84193ce53b..29c74eee99 100644
@@ -3,6 +3,11 @@
 
 int git_regcomp(regex_t *preg, const char *pattern, int cflags)
 {
+	/*
+	 * If you are on macOS with clang and fail to compile this line,
+	 * https://lore.kernel.org/git/[email protected]/
+	 * might be relevant.
+	 */
 	if (!(cflags & REG_EXTENDED))
 		cflags |= REG_ENHANCED;
 	return regcomp(preg, pattern, cflags);