Skip to contentSkip to conversation

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

DISCUSSION Junio C Hamano 4 participants 8 messages Mar 25 – Mar 26

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/

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

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

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

* 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.
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.
source: <20260313-pks-upload-pack-write-contention-v4-0-7a9668061f7f@pks.im>

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

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

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

* jt/fast-import-signed-modes (2026-03-24) 4 commits
- fast-import: add 'abort-if-invalid' mode to '--signed-tags=<mode>'
- fast-import: add 'sign-if-invalid' mode to '--signed-tags=<mode>'
- fast-import: add 'strip-if-invalid' mode to '--signed-tags=<mode>'
- fast-import: add 'abort-if-invalid' mode to '--signed-commits=<mode>'

Handling of signed commits and tags in fast-import has been made more configurable.
source: <[email protected]>

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

* ps/graph-lane-limit (2026-03-23) 3 commits
- graph: add documentation and tests about --graph-lane-limit
- graph: truncate graph visual output
- graph: add --graph-lane-limit option

The graph output from commands like "git log --graph" can now be limited to a specified number of lanes, preventing overly wide output in repositories with many branches.

Needs review.
source: <[email protected]>

* rs/use-strvec-pushv (2026-03-24) 2 commits (merged to 'next' on 2026-03-24 at 7c6487dcaf)
+ use strvec_pushv() to add another strvec
+ Merge branch 'ps/build-tweaks' into rs/use-strvec-pushv (this branch uses ps/build-tweaks.)

Code paths that loop over another array to push each element into a strvec have been rewritten to use strvec_pushv() instead.

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

* cc/promisor-auto-config-url (2026-03-23) 16 commits
- doc: promisor: improve acceptFromServer entry
- promisor-remote: auto-configure unknown remotes
- promisor-remote: trust known remotes matching acceptFromServerUrl
- promisor-remote: introduce promisor.acceptFromServerUrl
- t5710: use proper file:// URIs for absolute paths
- promisor-remote: refactor should_accept_remote() control flow
- promisor-remote: pass config entry to all_fields_match() directly
- promisor-remote: add 'local_name' to 'struct promisor_info'
- promisor-remote: remove the 'accepted' strvec
- promisor-remote: keep accepted promisor_info structs alive
- promisor-remote: refactor accept_from_server()
- promisor-remote: refactor has_control_char()
- promisor-remote: clarify that a remote is ignored
- urlmatch: add url_is_valid_pattern() helper
- urlmatch: change 'allow_globs' arg to bool
- promisor-remote: try accepted remotes before others in get_direct()

Promisor remote handling is enhanced to auto-configure remotes based on a URL whitelist.

Needs review.
source: <[email protected]>

* kj/refspec-parsing-outside-repository (2026-03-23) 2 commits
- refspec: fix typo in comment
- remote-curl: fall back to default hash outside repo

"git ls-remote '+refs/tags/*:refs/tags/*' https://..." run outside a repository would dereference a NULL while trying to see if the given refspec is a single-object refspec, which has been corrected.

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

* 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-22) 9 commits
(merged to 'next' on 2026-03-24 at e7b555cbc5)
+ 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 'master'.
source: <[email protected]>

* ps/fsck-wo-the-repository (2026-03-23) 12 commits
- builtin/fsck: stop using the_repository in error reporting
- 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: drop USE_THE_REPOSITORY
- fsck: store repository in fsck options
- fsck: initialize fsck options via a function
- fetch-pack: move fsck options into function scope

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

Needs review.
source: <20260323-b4-pks-fsck-without-the-repository-v2-0-e8dc79bca651@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.

Reproduction being discussed.
cf. <[email protected]>
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]>

* 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-23) 6 commits
- t5620: test backfill's unknown argument handling
- 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.

Comments?
source: <[email protected]>

* jw/t2203-status-pipe-fix (2026-03-16) 1 commit
(merged to 'next' on 2026-03-23 at 521c6eb44b)
+ t2203: avoid suppressing git status exit code

Test clean-up.

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

* ps/commit-graph-overflow-fix (2026-03-23) 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.

Waiting for review response.
cf. <[email protected]>
source: <[email protected]>

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

git replay now supports replaying down to the root commit.

Will merge to 'next'?
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 (merged to 'next' on 2026-03-23 at 881af371ef)
+ 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 'master'.
source: <[email protected]>

* ai/t2107-test-path-is-helpers (2026-03-18) 1 commit (merged to 'next' on 2026-03-23 at 56d10e5f76)
+ t2107: modernize path existence check

Test cleanup.

Will merge to 'master'.
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.

Expecting a (hopefully small and final) reroll?
cf. <[email protected]>
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) 16 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
- object-file: fix sparse 'plain integer as NULL pointer' error (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 (merged to 'next' on 2026-03-24 at f7374e8e70)
+ t5315: use test_path_is_file for loose-object check

Test clean-up.

Will merge to 'master'.
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]>

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

* jw/apply-corrupt-location (2026-03-17) 3 commits (merged to 'next' on 2026-03-23 at 18e9b8f91f)
+ 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 'master'.
source: <[email protected]>

* mf/format-patch-commit-list-format (2026-03-23) 9 commits
(merged to 'next' on 2026-03-24 at 0f5b6702eb)
+ 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.

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>

* 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
(this branch is used by rs/use-strvec-pushv.)

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-12) 7 commits
(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 'master'.
source: <20260312-b4-pks-odb-source-count-objects-v2-0-5914f69256bf@pks.im>

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

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

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

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

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

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

* 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 (merged to 'next' on 2026-03-24 at 9cb4ec5fad)
+ 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 'master'.
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]>

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

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

No longer needed.
cf. <[email protected]> cf. <[email protected]>
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 10 lines · Junio C Hamano

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

After a grueling session with tmate to connect to a GitHub Actions Windows runner, I can confirm that the patch below fixes the failure.

I had a lingering worry that maybe the test was a canary in the coal mine, telling us that other real-world cases may be mad about getting kill()ed. But after looking at it, I'm not sure. The fake ssh command is _so_ fake here that it produces garbage output immediately and is killed before even doing its logging. A real failure would happen farther along in the process. And presumably a real ssh client that has cleanup to do would catch the signal and do that cleanup.

So...it's probably OK to fix the test and proceed with graduating the topic, I think?

Anyway, here's the fix I came up with. But see below the --- line, too.

-- >8 --
Subject: [PATCH] t0061: simplify .bat test

The test added by 71f4960b91 (t0061: fix test for argv[0] with spaces (MINGW only), 2019-10-01) checks that we can use a .bat file with spaces as GIT_SSH.

This is a good test in the sense that it's how the original bug was detected. And as the commit message there describes, there are some elements of the bug that are likely to come up with GIT_SSH and not
elsewhere: namely that in addition to the .bat file having spaces, we must pass an argument with spaces (which happens naturally with ssh, since we pass the upload-pack shell command for the other side to run).

But using GIT_SSH does complicate matters:

1. We actually run the ssh command _twice_, once to probe the ssh variant with "-G" in fill_ssh_args(), and then a second time to actually make the connection. So we have to account for that when checking the output.

2. Our fake ssh .bat file does not actually run ssh. So we expect the command to fail, but not before the .bat file has touched the "out" marker file that tells us it has run.

This works now, but is fragile. In particular, the .bat file by default will echo commands it runs to stdout. From the perspective of the parent Git process, this is protocol-breaking garbage, and upon seeing it will die().

That is OK for now because we don't bother to do any cleanup of the child process. But there is a patch under discussion, dd3693eb08 (transport-helper, connect: use clean_on_exit to reap children on abnormal exit, 2026-03-12), which causes us to kill() the .bat process. This happens before it actually touches the "out" file, causing the test to fail.

We can simplify this by just using the "test-tool run-command" helper. That lets us run whatever command we like with the arguments we want. The argument here has a space, which is enough to trigger the original bug that 71f4960b91 was testing. I verified that by reverting eb7c786314 (mingw: support spawning programs containing spaces in their names, 2019-07-16), the original fix, and confirming that the test fails (but succeeds without the revert).

---
One thing that puzzled me but that I figured out while writing the commit message above is why the .bat file was writing garbage to stdout in the first place. But then through the haze of DOS memories, I recalled the horror of having to put "@echo off" at the top of every batch file.

So probably the smallest fix is to just add that to the start of the .bat file, or even just put "@" at the start of the single command in the file. That would suppress the extra stdout, and Git would not realize the bogus ssh command is failing until it exits without writing anything (which is after it has touched the "out" file).

I didn't have the stomach or patience to spin up the tmate environment again and test it, though. I do like how much simpler the test gets with the t/helper program, but arguably using GIT_SSH is more realistic. I dunno.

 t/t0061-run-command.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
t/t0061-run-command.sh +2 -10
index 2f77fde0d9..60cfe65979 100755
@@ -287,16 +287,8 @@ test_expect_success MINGW 'can spawn .bat with argv[0] containing spaces' '
 	rm -f out &&
 	echo "echo %* >>out" >"$bat" &&
 
-	# Ask git to invoke .bat; clone will fail due to fake SSH helper
-	test_must_fail env GIT_SSH="$bat" git clone myhost:src ssh-clone &&
-
-	# Spawning .bat can fail if there are two quoted cmd.exe arguments.
-	# .bat itself is first (due to spaces in name), so just one more is
-	# needed to verify. GIT_SSH will invoke .bat multiple times:
-	# 1) -G myhost
-	# 2) myhost "git-upload-pack src"
-	# First invocation will always succeed. Test the second one.
-	grep "git-upload-pack" out
+	test-tool run-command run-command "$bat" "arg with spaces" &&
+	test_grep "arg with spaces" out
 '
 
 test_done
Signature · 1 line
2.53.0.1057.g8b84bc5fb6
#2 lore raw
In reply to Junio C Hamano
Quoted 7 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]>

I think this was considered ready in the previous 'What's cooking in git.git', so the status can be changed now.

Thanks,
Shreyansh

#3 lore raw
Quoted 10 lines · Shreyansh Paliwal
Quoted 7 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]>

I think this was considered ready in the previous 'What's cooking in git.git', so the status can be changed now.

This was listed in the new topics section in issue #07 (Mar 19) but I do not recall updating its status in any later issue. The only change was in issue #08 (Mar 21) in which the topic was moved from new to cooking without changing any status.

The only comment the patch got was from me about interaction with other topics in flight, and there was no discussion or comments on what the patch wants to do makes sense, or if the way how the patch does so is correct, which should be the real review.

And I do not consider my single reading alone a sufficient review most of the time.

#4 lore raw

kh/name-rev-custom-format

In reply to Junio C Hamano
Quoted 9 lines · Junio C Hamano

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

I’m working on rewriting the functionality in the form of a new builtin git-format-rev(1) that lives in builtin/name-rev.c.

#5 lore raw

Re: kh/name-rev-custom-format

Quoted 5 lines · Kristoffer Haugsbakk
Quoted 4 lines · Junio C Hamano

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

Quoted 8 lines
Quoted 5 lines

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

Comments?
source: <[email protected]>

I’m working on rewriting the functionality in the form of a new builtin git-format-rev(1) that lives in builtin/name-rev.c.

By the way, why do we want yet another builtin in the first place? Wouldn't this be done as a new option to "git log", for example?

#6 lore raw

Re: kh/name-rev-custom-format

Quoted 10 lines · Junio C Hamano
Quoted 8 lines · Kristoffer Haugsbakk
Quoted 7 lines · Junio C Hamano

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

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Comments?
source: <[email protected]>

I’m working on rewriting the functionality in the form of a new builtin git-format-rev(1) that lives in builtin/name-rev.c.

By the way, why do we want yet another builtin in the first place?

I didn’t want another builtin. I looked at the options and didn’t find anything that fit the described use case.

With git-name-rev(1) it looked like formatting options could crowd up the place.

Quoted 1 line

Wouldn't this be done as a new option to "git log", for example?

Okay with me.

git-log(1) blocks until I have closed stdin and effectively dedups the output.

    git log --oneline  --stdin --no-walk
    HEAD
    HEAD
    HEAD
    ^D
    <HEAD is listed one time>

So if an option could tweak it to instead (1) give one output per line (like git-name-rev(1)) and (2) not deduplicate (well, follows from (1)) then the problem seems solved.

Thinking out loud here.

#7 lore raw

Re: kh/name-rev-custom-format

Quoted 9 lines · Kristoffer Haugsbakk

With git-name-rev(1) it looked like formatting options could crowd up the place.

Quoted 1 line

Wouldn't this be done as a new option to "git log", for example?

Okay with me.

git-log(1) blocks until I have closed stdin and effectively dedups the output.

Ah, I forgot about the "--stdin" mode. That makes it a non-starter X-<. Sorry about the noise.

Quoted 13 lines
    git log --oneline  --stdin --no-walk
    HEAD
    HEAD
    HEAD
    ^D
    <HEAD is listed one time>

So if an option could tweak it to instead (1) give one output per line (like git-name-rev(1)) and (2) not deduplicate (well, follows from (1)) then the problem seems solved.

Thinking out loud here.