Skip to contentSkip to conversation

What's cooking in git.git (May 2026, #06)

DISCUSSION Junio C Hamano 2 participants 2 messages May 23 – May 24

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

* aw/validate-proxy-url-scheme (2026-05-05) 1 commit (merged to 'next' on 2026-05-15 at da9c1b71d7)
+ http: reject unsupported proxy URL schemes

Misspelt proxy URL (e.g., httt://...) did not trigger any warning or failure, which has been corrected.
source: <[email protected]>

* jc/ci-enable-expensive (2026-05-10) 2 commits
(merged to 'next' on 2026-05-15 at d258bb5e55)
+ ci: enable EXPENSIVE for contributor builds
+ Merge branch 'js/objects-larger-than-4gb-on-windows' into jc/ci-enable-expensive

Enable expensive tests to catch topics that may cause breakages on integration branches closer to their origin in the contributor PR builds.
source: <[email protected]>

* jk/apply-leakfix (2026-05-15) 1 commit
(merged to 'next' on 2026-05-20 at 725a20bf93)
+ apply: plug leak on "patch too large" error

Leakfix.
source: <[email protected]>

* jk/commit-sign-overflow-fix (2026-05-15) 1 commit (merged to 'next' on 2026-05-20 at e1a320d4e5)
+ commit: handle large commit messages in utf8 verification

Leakfix.
source: <[email protected]>

* kh/doc-log-decorate-list (2026-04-27) 2 commits (merged to 'next' on 2026-05-15 at f740311a37)
+ doc: log: use the same delimiter in description list
+ doc: log: fix --decorate description list

Doc update.
cf. <[email protected]>
source: <[email protected]>

* kn/refs-generic-helpers (2026-05-04) 9 commits
(merged to 'next' on 2026-05-15 at 62cb4e0ce2)
+ refs: use peeled tag values in reference backends
+ refs: add peeled object ID to the ref_update struct
+ refs: move object parsing to the generic layer
+ update-ref: handle rejections while adding updates
+ update-ref: move print_rejected_refs() up
+ refs: return ref_transaction_error from ref_transaction_update()
+ refs: extract out reflog config to generic layer
+ refs: introduce ref_store_init_options
+ refs: remove unused typedef 'ref_transaction_commit_fn'

Refactor service routines in the ref subsystem backends.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* mm/git-url-parse (2026-05-01) 8 commits (merged to 'next' on 2026-05-15 at 416deceeeb)
+ t9904: add tests for the new url-parse builtin
+ doc: describe the url-parse builtin
+ builtin: create url-parse command
+ urlmatch: define url_parse function
+ url: return URL_SCHEME_UNKNOWN instead of dying
+ url: move scheme detection to URL header/source
+ url: move url_is_local_not_ssh to url.h
+ connect: rename enum protocol to url_scheme

The internal URL parsing logic has been made accessible via a new subcommand "git url-parse".
cf. <[email protected]>
cf. <20260512085734.GA26769@tb-raspi4>
source: <[email protected]>

* ps/maintenance-daemonize-lockfix (2026-05-13) 2 commits (merged to 'next' on 2026-05-21 at 9b7fa37559)
+ run-command: honor "gc.auto" for auto-maintenance
+ builtin/maintenance: fix locking with "--detach"

"git maintenance" that goes background did not use the lockfile to prevent multiple maintenance processes from running at the same time, which has been corrected.
cf. <[email protected]>
source: <20260513-pks-maintenance-fix-lock-with-detach-v3-0-f27a1ac82891@pks.im>

* pw/xdiff-shrink-memory-consumption (2026-05-04) 5 commits (merged to 'next' on 2026-05-15 at 7a867909d2)
+ xdiff: reduce the size of array
+ xprepare: simplify error handling
+ xdiff: cleanup xdl_clean_mmatch()
+ xdiff: reduce size of action arrays
+ Merge branch 'en/xdiff-cleanup-3' into pw/xdiff-shrink-memory-consumption

Shrink wasted memory in Myers diff that does not account for common prefix and suffix removal.
source: <[email protected]>

* sp/shallow-deepen-on-non-shallow-repo-fix (2026-05-11) 1 commit (merged to 'next' on 2026-05-15 at 67dd491aae)
+ shallow: fix relative deepen on non-shallow repositories

"git fetch --deepen=<n>" in a full clone truncated the history to <n> commits deep, which has been corrected to be a no-op instead.
source: <[email protected]>

* za/t2000-modernise-more (2026-04-29) 1 commit (merged to 'next' on 2026-05-15 at 3b524d0ba5)
+ t2000: consolidate second scenario into a single test block

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

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

* gh/jump-auto-mode (2026-05-21) 1 commit
- git-jump: pick a mode automatically when invoked without arguments

The 'git-jump' command (in contrib/) has been taught to automatically pick a mode (merge, diff, or ws) when invoked without arguments.

Comments?
source: <[email protected]>

* sp/doc-range-diff-takes-notes (2026-05-20) 1 commit (merged to 'next' on 2026-05-22 at 020bec81b7)
+ Documentation/git-range-diff: add missing notes options in synopsis

Doxfix.

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

* ps/odb-source-loose (2026-05-21) 19 commits
- odb/source-loose: drop pointer to the "files" source
- odb/source-loose: stub out remaining callbacks
- odb/source-loose: wire up write_object_stream() callback
- object-file: refactor writing objects to use loose source
- odb/source-loose: wire up write_object() callback
- loose: refactor object map to operate on struct odb_source_loose
- odb/source-loose: wire up freshen_object() callback
- odb/source-loose: drop odb_source_loose_has_object()
- odb/source-loose: wire up count_objects() callback
- odb/source-loose: wire up find_abbrev_len() callback
- odb/source-loose: wire up for_each_object() callback
- odb/source-loose: wire up read_object_stream() callback
- odb/source-loose: wire up read_object_info() callback
- odb/source-loose: wire up close() callback
- odb/source-loose: wire up reprepare() callback
- odb/source-loose: start converting to a proper struct odb_source
- odb/source-loose: store pointer to "files" instead of generic source
- odb/source-loose: move loose source into "odb/" subsystem
- Merge branch 'ps/odb-in-memory' into ps/odb-source-loose (this branch uses jt/odb-transaction-write and ps/odb-in-memory.)

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

Comments?
source: <[email protected]>

* ps/setup-centralize-odb-creation (2026-05-21) 9 commits
- setup: construct object database in apply_repository_format()
- repository: stop reading loose object map twice on repo init
- setup: stop initializing object database without repository
- setup: stop creating the object database in setup_git_env()
- repository: stop initializing the object database in repo_set_gitdir()
- setup: deduplicate logic to apply repository format
- setup: drop setup_git_env()
- t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORY
- Merge branch 'ps/setup-wo-the-repository' into ps/setup-centralize-odb-creation (this branch uses ps/setup-wo-the-repository.)

The setup logic to discover and configure repositories has been refactored, and the initialization of the object database has been centralized.

Comments?
source: <20260521-b4-pks-setup-centralize-odb-creation-v1-0-f130d2a7e8ae@pks.im>

* ps/gitlab-ci-macOS-improvements (2026-05-21) 2 commits (merged to 'next' on 2026-05-22 at aaa3c7021e)
+ gitlab-ci: update macOS image
+ gitlab-ci: upgrade macOS runners

Update GitLab CI jobs that exercise macOS.

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

* kh/doc-hook (2026-05-21) 4 commits
- doc: hook: don’t self-link via config include
- doc: config: include existing git-hook(1) section
- doc: hook: consistently capitalize Git
- doc: hook: remove stray backtick

Doc updates.

Comments?
source: <[email protected]>

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

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

Comments?
source: <[email protected]>

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

* jk/commit-graph-lazy-load-fallback (2026-05-18) 1 commit (merged to 'next' on 2026-05-22 at d1188df466)
+ commit: fall back to full read when maybe_tree is NULL

The logic to lazy-load trees from the commit-graph has been made more robust by falling back to reading the commit object when the commit-graph is no longer available.

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

* jk/connect-service-enum (2026-05-21) 2 commits
- transport-helper: fix typo in BUG() message (merged to 'next' on 2026-05-21 at fd80c61e21)
+ connect: use "service" enum for "name" argument

The "name" argument in git_connect() and related functions has been converted to a "service" enum to improve type safety and clarify its purpose.

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

* jk/sq-dequote-cleanup (2026-05-18) 3 commits (merged to 'next' on 2026-05-21 at fbedf2daea)
+ quote: simplify internals of dequoting
+ quote: drop sq_dequote_to_argv()
+ quote.h: bump strvec forward declaration to the top

Code simplification.

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

* aj/stash-patch-optimize-temporary-index (2026-05-19) 1 commit
- stash: reuse cached index entries in --patch temporary index

"git stash -p" has been optimized by reusing cached index entries in its temporary index, avoiding unnecessary lstat() calls on unchanged files.
source: <[email protected]>

* tb/bitmap-build-performance (2026-05-19) 9 commits
- pack-bitmap: build pseudo-merge bitmaps after regular bitmaps
- pack-bitmap: remember pseudo-merge parents
- pack-bitmap: sort bitmaps before XORing
- pack-bitmap: cache object positions during fill
- pack-bitmap: consolidate find_object_pos() success path
- pack-bitmap: reuse stored selected bitmaps
- pack-bitmap: check subtree bits before recursing
- pack-bitmap: pass object position to fill_bitmap_tree()
- Merge branch 'tb/pseudo-merge-bugfixes' into tb/bitmap-build-performance (this branch uses tb/pseudo-merge-bugfixes.)

Reachability bitmap generation has been significantly optimized. By reordering tree traversal, caching object positions, and refining how pseudo-merge bitmaps are constructed, the performance of "git repack --write-midx-bitmaps" is improved, especially for large repositories and when using pseudo-merges.
source: <[email protected]>

* hn/status-pull-advice-qualified (2026-05-21) 1 commit
- 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>".

Comments?
source: <[email protected]>

* jk/dumb-http-alternate-fix (2026-05-12) 1 commit (merged to 'next' on 2026-05-17 at c1a51214fb)
+ http: handle absolute-path alternates from server root

The HTTP walker misinterpreted the alternates file that gives an absolute path when the server URL does not have the final slash (i.e., "https://example.com" not "https://example.com/").

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

* jk/pretty-no-strbuf-presizing (2026-05-12) 1 commit (merged to 'next' on 2026-05-17 at ee684c614f)
+ pretty: drop strbuf pre-sizing from add_rfc2047()

Remove ineffective strbuf presizing that would have computed an allocation that would not have fit in the available memory anyway, or too small due to integer wraparound to cause immediate automatic growing.

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

* kk/merge-octopus-optim (2026-05-11) 1 commit (merged to 'next' on 2026-05-20 at afe427dc66)
+ merge: use repo_in_merge_bases for octopus up-to-date check

The logic to determine that branches in an octopus merge are independent has been optimized.

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

* rs/strbuf-add-uint (2026-05-12) 4 commits
- ls-tree: use strbuf_add_uint()
- ls-files: use strbuf_add_uint()
- cat-file: use strbuf_add_uint()
- strbuf: add strbuf_add_uint()

Adding a decimal integer with strbuf_addf("%u") appears commonly; they have been optimized by using a custom formatter.

Comments?
source: <[email protected]>

* ta/approxidate-noon-fix (2026-05-21) 4 commits
- approxidate: use deferred mday adjustments for "specials"
- approxidate: make "specials" respect fixed day-of-month
- t0006: add support for approxidate test date adjustment
- approxidate: make "today" wrap to midnight

"Friday noon" asked in the morning on Sunday was parsed to be one day before the specified time, which has been corrected.

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

* mm/doc-word-diff (2026-05-13) 1 commit
- doc: clarify that --word-diff operates on line-level hunks

The documentation for "--word-diff" has been extended with a bit of implementation detail of where these different words come from.

Comments?
source: <[email protected]>

* rs/strbuf-add-oid-hex (2026-05-13) 1 commit
- hex: add and use strbuf_add_oid_hex()

Formatting object name in full hexadecimal form has been optimized by using a new strbuf_add_oid_hex() helper function.

Comments?
source: <[email protected]>

* kk/limit-list-optim (2026-05-14) 1 commit
(merged to 'next' on 2026-05-19 at f17450dd1b)
+ revision: use priority queue in limit_list()

The limit_list() function that is one of the core part of the revision traversal infrastructure has been optimized by replacing its use of linear list with priority queue.

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

* ed/check-connected-close-err-fd (2026-05-16) 1 commit
(merged to 'next' on 2026-05-22 at 00d592399e)
+ Merge branch 'ed/check-connected-close-err-fd-2.53' into ed/check-connected-close-err-fd (this branch uses ed/check-connected-close-err-fd-2.53.)

File descriptor leak fix.

Will merge to 'master'.
(this branch uses ed/check-connected-close-err-fd-2.53.)

* ed/check-connected-close-err-fd-2.53 (2026-05-14) 1 commit (merged to 'next' on 2026-05-22 at 1017d0e022)
+ connected: close err_fd in promisor fast-path (this branch is used by ed/check-connected-close-err-fd.)

File descriptor leak fix (for 2.54 maintenance track).

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

* kk/tips-reachable-from-bases-optim (2026-05-16) 2 commits (merged to 'next' on 2026-05-22 at 87d6b8e666)
+ t6600: add tests for duplicate tips in tips_reachable_from_bases()
+ commit-reach: use object flags for tips_reachable_from_bases()

Revision traversal optimization.

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

* pb/doc-diff-format-updates (2026-05-15) 3 commits
(merged to 'next' on 2026-05-20 at fe8d31e9f9)
+ diff-format.adoc: mode and hash are 0* for unmerged paths from index only
+ diff-format.adoc: 'git diff-files' prints two lines for unmerged files
+ diff-format.adoc: remove mention of diff-tree specific output

Doc updates.

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

* ps/t3903-cover-stash-include-untracked (2026-05-16) 1 commit (merged to 'next' on 2026-05-20 at f1e7ac1cbd)
+ stash: add coverage for show --include-untracked

Test coverage has been added to "git stash --include-untracked".

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

* rs/trailer-fold-optim (2026-05-15) 1 commit (merged to 'next' on 2026-05-20 at 38c9fb15c2)
+ trailer: change strbuf in-place in unfold_value()

Code simplification.

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

* rs/use-builtin-add-overflow-explicitly-on-clang (2026-05-18) 2 commits (merged to 'next' on 2026-05-21 at c223b71079)
+ use __builtin_add_overflow() in st_add() with Clang
+ strbuf: use st_add3() in strbuf_grow()

Micro optimization of codepaths that compute allocation sizes carefully.

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

* tc/generate-configlist-fix-for-older-ninja (2026-05-15) 1 commit (merged to 'next' on 2026-05-22 at 8322bfb8f2)
+ generate-configlist: collapse depfile for older Ninja

Build update.

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

* hn/config-typo-advice (2026-05-16) 1 commit
- config: suggest the correct form when key contains "=" in set context

"git config foo.bar=baz" is not likely to be a request to read the value of such a variable with '=' in its name; rather it is plausible that the user meant "git config set foo.bar baz". Give advice when giving an error message.

Comments?
source: <[email protected]>

* ja/doc-synopsis-style-again (2026-05-17) 5 commits
- doc: convert git-imap-send synopsis and options to new style
- doc: convert git-apply synopsis and options to new style
- doc: convert git-am synopsis and options to new style
- doc: convert git-grep synopsis and options to new style
- doc: convert git-bisect to synopsis style

A batch of documentation pages has been updated to use the modern synopsis style.

Comments?
source: <[email protected]>

* kn/refs-fsck-skip-lock-files (2026-05-17) 1 commit (merged to 'next' on 2026-05-21 at 91e30e3543)
+ refs/files: skip lock files during consistency checks

The consistency checks for the files reference backend have been updated to skip lock files earlier, avoiding unnecessary parsing of intermediate files.

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

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

Comments?
cf. <[email protected]>
source: <[email protected]>

* ag/sequencer-remove-unused-struct-member (2026-05-11) 1 commit (merged to 'next' on 2026-05-17 at 8553437ae1)
+ sequencer: remove todo_add_branch_context.commit

Code clean-up.

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

* hn/branch-prune-merged (2026-05-21) 4 commits
- branch: add --dry-run for --prune-merged
- branch: add branch.<name>.pruneMerged opt-out
- branch: add --prune-merged <branch>
- branch: add --forked <branch>

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

Comments?
source: <[email protected]>

* mm/diff-U-takes-no-negative-values (2026-05-12) 4 commits (merged to 'next' on 2026-05-17 at d81439a049)
+ parse-options: clarify what "negated" means for PARSE_OPT_NONEG
+ xdiff: guard against negative context lengths
+ diff: reject negative values for -U/--unified
+ diff: reject negative values for --inter-hunk-context

The command line parser for "git diff" learned a few options take only non-negative integers.

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

* dk/doc-exclude-is-shared-per-repo (2026-05-12) 1 commit (merged to 'next' on 2026-05-17 at ddc761aec6)
+ ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

Document the fact that .git/info/exclude is shared across worktrees linked to the same repository.

Will merge to 'master'.
cf. <[email protected]>
source: <ec97ad3f054e90b675f099a36a81a23bb4b2a0ed.1778620784.git.ben.knoble+github@gmail.com>

* kk/paint-down-to-common-optim (2026-05-11) 2 commits (merged to 'next' on 2026-05-17 at 2e39c767e5)
+ commit-reach: early exit paint_down_to_common for single merge-base
+ commit-reach: introduce merge_base_flags enum

"git merge-base" optimization.

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

* st/daemon-sockaddr-fixes (2026-05-14) 3 commits
- daemon: guard NULL REMOTE_PORT in execute() logging
- daemon: fix IPv6 address truncation in ip2str()
- daemon: fix IPv6 address corruption in lookup_hostname()

Correct use of sockaddr API in "git daemon".

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

* ob/more-repo-config-values (2026-04-23) 8 commits
- env: move "warn_on_object_refname_ambiguity" into struct repo_config_values
- env: move "sparse_expect_files_outside_of_patterns" into repo_config_values
- env: move "core_sparse_checkout_cone" into struct repo_config_values
- environment: move "precomposed_unicode" into struct repo_config_values
- environment: move "pack_compression_level" into struct repo_config_values
- environment: move zlib_compression_level into struct repo_config_values
- environment: move "check_stat" into struct repo_config_values
- environment: move "trust_ctime" into struct repo_config_values

Expecting a reroll.
cf. <CAD=f0L8-_3sDGGkCzF4WA0xmUtaY_qiz__3zq5AemLgwTsqvsg@mail.gmail.com> cf. <[email protected]>
source: <[email protected]>

* cc/promisor-auto-config-url-more (2026-05-19) 9 commits
- 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'
- Merge branch 'cc/promisor-auto-config-url' into cc/promisor-auto-config-url-more

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.

Comments?
source: <[email protected]>

* hn/checkout-track-fetch (2026-05-21) 1 commit
- checkout: extend --track with a "fetch" mode to refresh start-point

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

Comments?
source: <[email protected]>

* mf/revision-max-count-oldest (2026-05-18) 1 commit
- revision.c: implement --max-count-oldest

"git rev-list" (and "git log" family of commands) learned a new "--max-count-oldest" that picks oldest N commits in the range instead of the usual newest.

Comments?
source: <8210d60832b9a58aa4d71fc3790e44d8989564ce.1779152064.git.mroik@delayed.space>

* mm/line-log-cleanup (2026-04-27) 3 commits
- line-log: allow non-patch diff formats with -L
- line-log: integrate -L output with the standard log-tree pipeline
- revision: move -L setup before output_format-to-diff derivation

Code clean-up.

Comments?
cf. <[email protected]>
source: <[email protected]>

* ds/path-walk-filters (2026-05-13) 14 commits
- path-walk: support combine filter
- path-walk: support object:type filter
- path-walk: support tree:0 filter
- t6601: tag otherwise-unreachable trees
- pack-objects: support sparse:oid filter with path-walk
- path-walk: add pl_sparse_trees to control tree pruning
- path-walk: support blob size limit filter
- backfill: die on incompatible filter options
- path-walk: support blobless filter
- path-walk: always emit directly-requested objects
- t/perf: add pack-objects filter and path-walk benchmark
- pack-objects: pass --objects with --path-walk
- t5620: make test work with path-walk var
- Merge branch 'en/backfill-fixes-and-edges' into ds/path-walk-filters

The "git pack-objects --path-walk" traversal has been integrated with several object filters, including blobless and sparse filters.

Comments?
source: <[email protected]>

* en/ort-harden-against-corrupt-trees (2026-04-20) 5 commits
- 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.

Needs review.
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.

Needs review.
source: <[email protected]>

* tb/pseudo-merge-bugfixes (2026-05-11) 9 commits
(merged to 'next' on 2026-05-19 at ecee155d5c)
+ pack-bitmap: prevent pattern leak on pseudo-merge re-assignment
+ Documentation: fix broken sampleRate in gitpacking(7)
+ pack-bitmap: reject pseudo-merge "sampleRate" of 0
+ pack-bitmap: parse commits in find_pseudo_merge_group_for_ref()
+ pack-bitmap: fix pseudo-merge lookup for shared commits
+ pack-bitmap: fix inverted binary search in pseudo_merge_at()
+ pack-bitmap-write: sort pseudo-merge commit lookup table in pack order
+ t5333: demonstrate various pseudo-merge bugs
+ t/helper: add 'test-tool bitmap write' subcommand
(this branch is used by tb/bitmap-build-performance.)

Fixes many bugs in pseudo-merge code.

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

* ds/fetch-negotiation-options (2026-05-19) 8 commits (merged to 'next' on 2026-05-21 at ff57fd9c97)
+ send-pack: pass negotiation config in push
+ remote: add remote.*.negotiationInclude config
+ fetch: add --negotiation-include option for negotiation
+ negotiator: add have_sent() interface
+ remote: add remote.*.negotiationRestrict config
+ transport: rename negotiation_tips
+ fetch: add --negotiation-restrict option
+ t5516: fix test order flakiness

The negotiation tip options in "git fetch" have been reworked to allow requiring certain refs to be sent as "have" lines, and to restrict negotiation to a specific set of refs.

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

* en/batch-prefetch (2026-05-14) 4 commits
(merged to 'next' on 2026-05-20 at 722acf81c8)
+ grep: prefetch necessary blobs
+ builtin/log: prefetch necessary blobs for git cherry
+ patch-ids.h: add missing trailing parenthesis in documentation comment
+ promisor-remote: document caller filtering contract

In a lazy clone, "git cherry" and "git grep" often fetch necessary blob objects one by one from promisor remotes. It has been corrected to collect necessary object names and fetch them in bulk to gain reasonable performance.

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

* ps/odb-in-memory (2026-04-10) 18 commits
(merged to 'next' on 2026-05-21 at c8709aa17f)
+ t/unit-tests: add tests for the in-memory object source
+ odb: generic in-memory source
+ odb/source-inmemory: stub out remaining functions
+ odb/source-inmemory: implement freshen_object() callback
+ odb/source-inmemory: implement count_objects() callback
+ odb/source-inmemory: implement find_abbrev_len() callback
+ odb/source-inmemory: implement for_each_object() callback
+ odb/source-inmemory: convert to use oidtree
+ oidtree: add ability to store data
+ cbtree: allow using arbitrary wrapper structures for nodes
+ odb/source-inmemory: implement write_object_stream() callback
+ odb/source-inmemory: implement write_object() callback
+ odb/source-inmemory: implement read_object_stream() callback
+ odb/source-inmemory: implement read_object_info() callback
+ odb: fix unnecessary call to find_cached_object()
+ odb/source-inmemory: implement free() callback
+ odb: introduce "in-memory" source
+ Merge branch 'jt/odb-transaction-write' into ps/odb-in-memory (this branch is used by ps/odb-source-loose; uses jt/odb-transaction-write.)

Add a new odb "in-memory" source that is meant to only hold tentative objects (like the virtual blob object that represents the working tree file used by "git blame").

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

* cl/conditional-config-on-worktree-path (2026-05-13) 2 commits (merged to 'next' on 2026-05-22 at 7851f494ae)
+ 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.

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

* ps/shift-root-in-graph (2026-04-27) 1 commit
- graph: add indentation for commits preceded by a parentless commit

In a history with more than one root commit, "git log --graph --oneline" stuffed an unrelated commit immediately below a root commit, which has been corrected by making the spot below a root unavailable.

Waiting for response(s) to review comment(s). cf. <[email protected]>
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.

Needs review.
cf. <[email protected]>
source: <[email protected]>

* th/promisor-quiet-per-repo (2026-04-06) 1 commit
- promisor-remote: fix promisor.quiet to use the correct repository

The "promisor.quiet" configuration variable was not used from relevant submodules when commands like "grep --recurse-submodules" triggered a lazy fetch, which has been corrected.

Comments?
source: <[email protected]>

* jt/odb-transaction-write (2026-05-14) 7 commits (merged to 'next' on 2026-05-21 at 61108abe4d)
+ odb/transaction: make write_object_stream() pluggable
+ object-file: generalize packfile writes to use odb_write_stream
+ object-file: avoid fd seekback by checking object size upfront
+ object-file: remove flags from transaction packfile writes
+ odb: update struct odb_write_stream read() callback
+ odb/transaction: use pluggable begin_transaction()
+ odb: split struct odb_transaction into separate header (this branch is used by ps/odb-in-memory and ps/odb-source-loose.)

ODB transaction interface is being reworked to explicitly handle object writes.

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

* sa/cat-file-batch-mailmap-switch (2026-04-15) 1 commit (merged to 'next' on 2026-05-22 at 197a9bad73)
+ cat-file: add mailmap subcommand to --batch-command

"git cat-file --batch" learns an in-line command "mailmap" that lets the user toggle use of mailmap.

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

* tb/incremental-midx-part-3.3 (2026-05-19) 16 commits (merged to 'next' on 2026-05-21 at 6c11c1a739)
+ repack: allow --write-midx=incremental without --geometric
+ repack: introduce --write-midx=incremental
+ repack: implement incremental MIDX repacking
+ packfile: ensure close_pack_revindex() frees in-memory revindex
+ builtin/repack.c: convert --write-midx to an OPT_CALLBACK
+ repack-geometry: prepare for incremental MIDX repacking
+ repack-midx: extract repack_fill_midx_stdin_packs()
+ repack-midx: factor out repack_prepare_midx_command()
+ midx: expose midx_layer_contains_pack()
+ repack: track the ODB source via existing_packs
+ midx: support custom --base for incremental MIDX writes
+ midx: introduce --no-write-chain-file for incremental MIDX writes
+ midx: use strvec for keep_hashes
+ midx: build keep_hashes array in order
+ midx: use strset for retained MIDX files
+ midx-write: handle noop writes when converting incremental chains

The repacking code has been refactored and compaction of MIDX layers have been implemented, and incremental strategy that does not require all-into-one repacking has been introduced.

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

* jd/unpack-trees-wo-the-repository (2026-03-31) 2 commits
- unpack-trees: use repository from index instead of global
- unpack-trees: use repository from index instead of global

A handful of inappropriate uses of the_repository have been rewritten to use the right repository structure instance in the unpack-trees.c codepath.

Comments?
source: <[email protected]>

* ps/setup-wo-the-repository (2026-05-19) 18 commits
(merged to 'next' on 2026-05-21 at d8fb5a7b3e)
+ setup: stop using the_repository in init_db()
+ setup: stop using the_repository in create_reference_database()
+ setup: stop using the_repository in initialize_repository_version()
+ setup: stop using the_repository in check_repository_format()
+ setup: stop using the_repository in upgrade_repository_format()
+ setup: stop using the_repository in setup_git_directory()
+ setup: stop using the_repository in setup_git_directory_gently()
+ setup: stop using the_repository in setup_git_env()
+ setup: stop using the_repository in set_git_work_tree()
+ setup: stop using the_repository in setup_work_tree()
+ setup: stop using the_repository in enter_repo()
+ setup: stop using the_repository in verify_non_filename()
+ setup: stop using the_repository in verify_filename()
+ setup: stop using the_repository in path_inside_repo()
+ setup: stop using the_repository in prefix_path()
+ setup: stop using the_repository in is_inside_work_tree()
+ setup: stop using the_repository in is_inside_git_dir()
+ setup: replace use of the_repository in static functions (this branch is used by ps/setup-centralize-odb-creation.)

Many uses of the_repository has been updated to use a more appropriate struct repository instance in setup.c codepath.

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

* kh/doc-trailers (2026-04-13) 9 commits
- doc: interpret-trailers: document comment line treatment
- doc: interpret-trailers: commit to “trailer block” term
- 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.

Needs review.
cf. <[email protected]>
source: <[email protected]>

* ps/graph-lane-limit (2026-03-27) 3 commits (merged to 'next' on 2026-05-22 at ca1c5e8432)
+ graph: add truncation mark to capped lanes
+ graph: add --graph-lane-limit option
+ graph: limit the graph width to a hard-coded max

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.

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

* jr/bisect-custom-terms-in-output (2026-05-14) 3 commits (merged to 'next' on 2026-05-22 at 1ccd1056c9)
+ rev-parse: use selected alternate terms to look up refs
+ bisect: print bisect terms in single quotes
+ bisect: use selected alternate terms in status output

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

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

* ua/push-remote-group (2026-05-03) 3 commits
- push: support pushing to a remote group
- remote: move remote group resolution to remote.c
- remote: fix sign-compare warnings in push_cas_option

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

Comments?
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]>
source: <SY0P300MB0801677A2A1E0FD38D06A841CE2A2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

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

On hold to help the base topic with wider exposure. (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/fsmonitor-linux (2026-04-15) 13 commits
(merged to 'next' on 2026-05-22 at 5d99c1765d)
+ 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
+ t9210, t9211: disable GIT_TEST_SPLIT_INDEX for scalar clone tests

The fsmonitor daemon has been implemented for Linux.

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

#1 lore raw

ds/path-walk-filters (was: What's cooking in git.git (May 2026, #06))

Quoted 16 lines · Junio C Hamano

* ds/path-walk-filters (2026-05-13) 14 commits
- path-walk: support combine filter
- path-walk: support object:type filter
- path-walk: support tree:0 filter
- t6601: tag otherwise-unreachable trees
- pack-objects: support sparse:oid filter with path-walk
- path-walk: add pl_sparse_trees to control tree pruning
- path-walk: support blob size limit filter
- backfill: die on incompatible filter options
- path-walk: support blobless filter
- path-walk: always emit directly-requested objects
- t/perf: add pack-objects filter and path-walk benchmark
- pack-objects: pass --objects with --path-walk
- t5620: make test work with path-walk var
- Merge branch 'en/backfill-fixes-and-edges' into ds/path-walk-filters

Quoted 5 lines

The "git pack-objects --path-walk" traversal has been integrated with several object filters, including blobless and sparse filters.

Comments?
source: <[email protected]>

Taylor has completed review on a small re-roll v5.

Thanks,
-Stolee