From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a7-smtp.messagingengine.com (fout-a7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42508383C6E for ; Tue, 12 May 2026 09:23:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778577799; cv=none; b=XbHCDWmxWaebw+wEdcWwLI3e0QeHF4LyG79lgYbvFIh5zCJf72OZf7V6iBb0viW73cafrRdhOd1YNJXpTAEihzHQuaXHxyxLN3yLxpbsDe+U3Mb3jZutlLJbzxsVL1acRRArdzq0lkIe7bo0QjqlwtL/V5kwQ/KTOr9bJ6Of+Q4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778577799; c=relaxed/simple; bh=pQycS0qJZOvfzmhiBhVKPttiDhngOMI0TTvu1Im9UuE=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=Uaqkw/BQtXwBh3RyyxldctnGKC6fr9taOGeLVEPKXyXZnWeVN1AgMrD4lOwca4fhhAcjzlGCajsAkNwXAT27X9s9Zmdv+Rlx0lfQDv6C7BWqleGdL7mqfOqixHCmWZJHVbtOAHQK4bagJpSWF/GWp0AQTzE+SC2k7p2GRmIfSUE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b=I6YpyZUM; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=HN2j2yjD; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pobox.com header.i=@pobox.com header.b="I6YpyZUM"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="HN2j2yjD" Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 8155BEC010C; Tue, 12 May 2026 05:23:14 -0400 (EDT) Received: from phl-frontend-02 ([10.202.2.161]) by phl-compute-05.internal (MEProxy); Tue, 12 May 2026 05:23:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pobox.com; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to; s=fm2; t=1778577794; x=1778664194; bh=RZnM/v6OaP VTL50k+b5l7pGacr+y3u9cyaSY4CGX00A=; b=I6YpyZUMsbgI15d+Ju+AJnQDjW S8ku9emOsZCO2L1vErknH6D6BeIC3E8Ek7RQpG9y+W7JMEpFVEJ69HC3mNAmbS3G WZx3XIkiADpkQ6BJXC6P+Rx2gDSo+Aui+nsIuRfdYdUT5frcAxxJQB+Sf0ENKf+0 L6d5fh2T13cSs3sXhvrvcwZGTnwSP01tvsqq4F1m0jpz9vIBjjCbVt1Paq8F0wz4 hNHe77Gs/3TP8deOdh4jBMSGrgXEgm2RHW6YP3z5+Y4EW66uoYXhsGRw5AK+loXx xcIDWuWMg1S5D4dP8htS0LRRDFgQWinvUEzujeq5+Mv+IXXN0sLSJOtA8tWw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1778577794; x=1778664194; bh=RZnM/v6OaPVTL50k+b5l7pGacr+y3u9cyaS Y4CGX00A=; b=HN2j2yjDc+11pNyqEH1yOepkw6HusmWl6sQdCSXD9D6J2trB5r4 9MGcsEcAMDxQxRrxdseTwELb74ON2/F03V9H03EbuYtppXNALxdAUDM6ODeG7pc2 2fqA4l01QAH63iCyicw7kp4rCO/ZK9/ThE6oa1dt8Qw0KbphisrW899+KgCgPwPc UrhegfJeaGIwwjQeQtJlLLi6PEAMVHelaI4PvxRwCMMkqQIll/Ic8T4lm+d4MLy0 Wb3ec/R8vbWIkOEI2D8dxHw31vb1hql4F0e93oXP/zFDg08iLQmGR7pQuLKmS+R8 roIhWqM7pe3Xe4cz0BYCRZt42PznWN3c5JQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgdduvddugeefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdljedmnecujfgurhephffvufffkf gfgggtgfesthekredttderjeenucfhrhhomheplfhunhhiohcuvecujfgrmhgrnhhouceo ghhithhsthgvrhesphhosghogidrtghomheqnecuggftrfgrthhtvghrnhepvddvuefhhf ehieffveeltdethedttdehjeejgefhhfeuveetueettedvjeejheelnecuffhomhgrihhn pehkvghrnhgvlhdrohhrghdpohhrrdgtiidpghhoohhglhgvshhouhhrtggvrdgtohhmpd hgihhthhhusgdrtghomhdpghhithhlrggsrdgtohhmnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepghhithhsthgvrhesphhosghogidrtghomh dpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhi thesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehlfihnsehlfihnrdhnvg htpdhrtghpthhtohepghhithhsthgvrhesphhosghogidrtghomh X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 12 May 2026 05:23:13 -0400 (EDT) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (May 2026, #03) X-master-at: 29bd7ed5127255713c1ac2f43b7c6f257d7b4594 X-next-at: 59709faab07346122d819453f4ad6f3ccdaf618e Date: Tue, 12 May 2026 18:23:12 +0900 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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). The first batch of topics marked for graduation for quite a while since 2.54-rc2 have all been merged to 'master'. 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] * sp/shallow-deepen-on-non-shallow-repo-fix (2026-05-11) 1 commit - shallow: fix relative deepen on non-shallow repositories "git fetch --deepen=" in a full clone truncated the history to commits deep, which has been corrected to be a no-op instead. Will merge to 'next'. source: <20260511192044.169557-1-samo_pogacnik@t-2.net> * ag/sequencer-remove-unused-struct-member (2026-05-11) 1 commit - sequencer: remove todo_add_branch_context.commit Code clean-up. Will merge to 'next'. source: * ps/maintenance-daemonize-lockfix (2026-05-11) 2 commits - 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.. Comments? source: <20260511-pks-maintenance-fix-lock-with-detach-v1-0-ccd7d62c9a40@pks.im> -------------------------------------------------- [Graduated to 'master'] * 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. Merged early in the cycle to 'master', *without* the final "for now, let's tone it down and allow everything" step, which would give us a chance to prove that the more stricter form that we were planning to postpone until Git 3.0 may not be needed. Or people may find issues in the stricter form already. We'll see. source: <20260305233452.3727126-1-gitster@pobox.com> * jc/t5551-fix-expensive (2026-05-07) 1 commit (merged to 'next' on 2026-05-11 at 1bafedde58) + t5551: "GIT_TEST_LONG=Yes make test" is broken Test fix. source: * jk/revert-aa-reap-transport-child-processes (2026-04-22) 1 commit (merged to 'next' on 2026-05-11 at b41904c1d3) + Revert "transport-helper, connect: use clean_on_exit to reap children on abnormal exit" Revert a recent change that introduced a regression to help mksh users. source: <20260422230020.GA1839627@coredump.intra.peff.net> * js/ci-github-actions-update (2026-04-30) 6 commits (merged to 'next' on 2026-05-11 at ba87f84054) + l10n: bump mshick/add-pr-comment from v2 to v3 + ci: bump git-for-windows/setup-git-for-windows-sdk from v1 to v2 + ci: bump actions/checkout from v5 to v6 + ci: bump actions/github-script from v8 to v9 + ci: bump actions/{upload,download}-artifact to v7 and v8 + ci: bump microsoft/setup-msbuild from v2 to v3 Update various GitHub Actions versions. source: * js/maintenance-fix-deadlock-on-win10 (2026-05-07) 2 commits (merged to 'next' on 2026-05-11 at e1b05301d1) + maintenance(geometric): do release the `.idx` files before repacking + mingw: optionally use legacy (non-POSIX) delete semantics To help Windows 10 installations, avoid removing files whose contents are still mmap()'ed. source: * js/t5564-socks-use-short-path (2026-04-29) 1 commit (merged to 'next' on 2026-05-11 at fbb23860ca) + t5564: use a short path for the SOCKS proxy socket Avoid hitting the pathname limit for socks proxy socket during the test. source: -------------------------------------------------- [Cooking] * js/mingw-no-nedmalloc (2026-05-08) 3 commits - mingw: remove the vendored compat/nedmalloc/ subtree - mingw: drop the build-system plumbing for nedmalloc - mingw: stop using nedmalloc Stop using unmaintained custom allocator in Windows build which was the last user of the code. Will merge to 'next'. source: * sj/submodule-update-clone-config-fix (2026-05-09) 1 commit (merged to 'next' on 2026-05-12 at 5a0094838a) + submodule-config: fix reading submodule.fetchJobs The configuration variable submodule.fetchJobs was not read correctly, which has been corrected. Will merge to 'master'. source: * aw/validate-proxy-url-scheme (2026-05-05) 1 commit - http: reject unsupported proxy URL schemes Misspelt proxy URL (e.g., httt://...) did not trigger any warning or failure, which has been corrected. Will merge to 'next'. source: <20260505091941.1825-2-aminnimaj@gmail.com> * hn/branch-prune-merged (2026-05-11) 5 commits - branch: add --all-remotes flag - branch: add branch..pruneMerged opt-out - branch: add --prune-merged - branch: let delete_branches warn instead of error on bulk refusal - branch: add --forked "git branch" command learned "--prune-merged" option to remove local branches that have already been merged to the remote-tracking branches they track. Expecting a reroll. cf. source: * kh/doc-restore-double-underscores-fix (2026-05-05) 1 commit (merged to 'next' on 2026-05-12 at 2e8fc7cdac) + doc: restore: remove double underscore Doc update. Will merge to 'master'. source: * mm/diff-U-takes-no-negative-values (2026-05-05) 3 commits - 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. Expecting a (hopefully small and final) reroll. cf. source: * ps/clang-w-glibc-2.43-and-_Generic (2026-05-10) 1 commit (merged to 'next' on 2026-05-12 at fca23344f2) + build: tolerate use of _Generic from glibc 2.43 with Clang Headers from glibc 2.43 when used with clang does not allow disabling C11 language features, causing build failures.. Will merge to 'master'. source: * mm/git-url-parse (2026-05-01) 8 commits - 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". Will merge to 'next'? cf. source: * kh/doc-commit-graph (2026-05-07) 1 commit (merged to 'next' on 2026-05-12 at b9cafeb32d) + doc: add caveat about turning off commit-graph Ramifications of turning off commit-graph has been documented a bit more clearly. Will merge to 'master'. source: * dk/doc-exclude-is-shared-per-repo (2026-05-08) 1 commit - 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. Needs more coverage. cf. source: * kk/paint-down-to-common-optim (2026-05-11) 2 commits - 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 'next'. source: * st/daemon-sockaddr-fixes (2026-05-08) 1 commit - daemon: fix network address handling bugs Correct use of sockaddr API in "git daemon". Waiting for response(s) to review comment(s). cf. source: * ag/rebase-update-refs-limit-to-branches (2026-05-10) 1 commit (merged to 'next' on 2026-05-12 at 5222da09bb) + rebase: ignore non-branch update-refs "git rebase --update-refs", when used with an rebase.instructionFormat with "%d" (describe) in it, tried to update local branch HEAD by mistake, which has been corrected. Will merge to 'master'. source: <20260510224111.64467-2-mail@abhinavg.net> * jc/ci-enable-expensive (2026-05-10) 2 commits - ci: enable EXPENSIVE for contributor builds - Merge branch 'js/objects-larger-than-4gb-on-windows' into jc/ci-enable-expensive (this branch uses js/objects-larger-than-4gb-on-windows.) Enable expensive tests to catch topics that may cause breakages on integration branches closer to their origin in the contributor PR builds. Will merge to 'next'. source: * rs/sideband-clear-line-before-print (2026-05-10) 1 commit (merged to 'next' on 2026-05-12 at 83880f8ce6) + sideband: clear full line when printing remote messages Tweak the way how sideband messages from remote are printed while we talk with a remote repository to avoid tickling terminal emulator glitches. Will merge to 'master'. source: <9826dabf-c9a6-4397-8ae6-a24f9c507f1b@web.de> * jh/alias-i18n-fixes (2026-04-24) 1 commit - alias: restore support for simple dotted aliases Further update to the i18n alias support to avoid regressions. Will merge to 'next'. source: <20260424161707.1514255-1-jonatan@jontes.page> * kn/refs-generic-helpers (2026-05-04) 9 commits - 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. Will merge to 'next'. cf. cf. <87o6isqq4q.fsf@toon--20250203-5JQV3.mail-host-address-is-not-set> source: <20260504-refs-move-to-generic-layer-v4-0-936ac2f0b1a3@gmail.com> * 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. cf. source: <20260423165432.143598-1-belkid98@gmail.com> * ps/history-fixup (2026-04-26) 3 commits - builtin/history: introduce "fixup" subcommand - builtin/history: generalize function to commit trees - replay: allow callers to control what happens with empty commits "git history" learned "fixup" command. Will merge to 'next'. cf. source: <20260427-b4-pks-history-fixup-v3-0-cb908f06264b@pks.im> * rs/grep-column-only-match-fix (2026-04-24) 1 commit (merged to 'next' on 2026-05-11 at a0d87e3104) + grep: fix --column --only-match for 2nd and later matches "git grep" update. Will merge to 'master'. source: <9bd69678-f04b-41d2-ad74-a386820d34c8@web.de> * sb/unpack-index-pack-buffer-resize (2026-04-28) 1 commit - index-pack, unpack-objects: increase input buffer from 4 KiB to 128 KiB Use a larger buffer size in the code paths to ingest pack stream. Will merge to 'next'. cf. source: * bc/sign-commit-with-custom-encoding (2026-04-27) 2 commits - commit: sign commit after mutating buffer - commit: name UTF-8 function appropriately Signing commit with custom encoding was passing the data to be signed at a wrong stage in the pipeline, which has been corrected. Will merge to 'next'. cf. source: <20260427221834.1824543-1-sandals@crustytoothpaste.net> * cc/promisor-auto-config-url-more (2026-04-27) 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. Waiting for response(s) to review comment(s). cf. <875x4yoys5.fsf@toon--20250203-5JQV3.mail-host-address-is-not-set> source: <20260427124108.3524129-1-christian.couder@gmail.com> * js/objects-larger-than-4gb-on-windows (2026-05-08) 11 commits - ci: run expensive tests on push builds to integration branches - t5608: mark >4GB tests as EXPENSIVE - test-tool synthesize: add precomputed SHA-256 pack for 4 GiB + 1 - test-tool synthesize: precompute pack for 4 GiB + 1 - test-tool synthesize: use the unsafe hash for speed - t5608: add regression test for >4GB object clone - test-tool: add a helper to synthesize large packfiles - delta, packfile: use size_t for delta header sizes - odb, packfile: use size_t for streaming object sizes - git-zlib: handle data streams larger than 4GB - index-pack, unpack-objects: use size_t for object size (this branch is used by jc/ci-enable-expensive.) Update code paths that assumed "unsigned long" was long enough for "size_t". Will merge to 'next'. source: * kh/doc-log-decorate-list (2026-04-27) 2 commits - doc: log: use the same delimiter in description list - doc: log: fix --decorate description list Doc update. Will merge to 'next'. cf. source: * za/t2000-modernise-more (2026-04-29) 1 commit - t2000: consolidate second scenario into a single test block Test update. Will merge to 'next'. cf. source: <20260429103607.406339-1-zakariyahali100@gmail.com> * hn/checkout-track-fetch (2026-05-11) 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? cf. source: * mf/revision-max-count-oldest (2026-05-09) 2 commits - SQUASH??? tac is not portable - 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. Expecting a (hopefully small and final) reroll. cf. source: <2f71a00b035e25b971641b77a6fa7626f1e2459c.1777578676.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. source: * pw/rename-to-get-current-worktree (2026-05-01) 1 commit (merged to 'next' on 2026-05-11 at 36ca1d49e2) + worktree: rename get_worktree_from_repository() Code clean-up. Will merge to 'master'. source: * ds/path-walk-filters (2026-05-11) 13 commits - path-walk: support `combine` filter - path-walk: support `object:type` filter - path-walk: support `tree:0` filter - 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 (this branch uses en/backfill-fixes-and-edges.) The "git pack-objects --path-walk" traversal has been integrated with several object filters, including blobless and sparse filters. Expecting a (hopefully small and final) reroll. cf. <0b4a8595-63e3-427c-8920-af4271ae1714@gmail.com> source: * en/ort-cached-rename-with-trivial-resolution (2026-04-20) 1 commit (merged to 'next' on 2026-05-11 at 9fe24668d9) + merge-ort: handle cached rename & trivial resolution interaction better "ort" merge backend improvements. Will merge to 'master'. source: * 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: * mf/format-patch-cover-letter-format-docfix (2026-04-22) 1 commit (merged to 'next' on 2026-05-11 at 3cca9cc117) + Fix docs for format.commitListFormat Docfix. Will merge to 'master'. source: <576d29f15e016889e02c253713656cd8cbf1f04c.1776894255.git.mroik@delayed.space> * sg/t6112-unwanted-tilde-expansion-fix (2026-04-21) 1 commit (merged to 'next' on 2026-05-12 at ad2d08eb44) + t6112: avoid tilde expansion Test fix. Will merge to 'master'. source: <20260421192132.51172-1-szeder.dev@gmail.com> * 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: * ss/t7004-unhide-git-failures (2026-04-20) 3 commits (merged to 'next' on 2026-05-11 at 9ee9feacb7) + t7004: avoid subshells to capture git exit codes + t7004: dynamically grab expected state in tests + t7004: drop hardcoded tag count for state verification Test clean-up. Will merge to 'master'. cf. source: <20260421053334.5414-1-r.siddharth.shrimali@gmail.com> * tb/pseudo-merge-bugfixes (2026-05-11) 9 commits - 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 Fixes many bugs in pseudo-merge code. Will merge to 'next'. source: * ds/fetch-negotiation-options (2026-04-22) 7 commits - send-pack: pass negotiation config in push - remote: add remote.*.negotiationInclude config - fetch: add --negotiation-include option for negotiation - 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. Needs review. source: * en/backfill-fixes-and-edges (2026-04-15) 3 commits (merged to 'next' on 2026-05-11 at baccbdf26d) + backfill: default to grabbing edge blobs too + backfill: document acceptance of revision-range in more standard manner + backfill: reject rev-list arguments that do not make sense (this branch is used by ds/path-walk-filters.) The 'git backfill' command now rejects revision-limiting options that are incompatible with its operation, uses standard documentation for revision ranges, and includes blobs from boundary commits by default to improve performance of subsequent operations. Will merge to 'master'. cf. <6e95b82a-19e3-460e-86f7-f899c2df261d@gmail.com> source: * mc/http-emptyauth-negotiate-fix (2026-04-30) 4 commits (merged to 'next' on 2026-05-12 at 843ae82cd0) + doc: clarify http.emptyAuth values (merged to 'next' on 2026-04-20 at 6539524ca2) + t5563: add tests for http.emptyAuth with Negotiate + http: attempt Negotiate auth in http.emptyAuth=auto mode + http: extract http_reauth_prepare() from retry paths The 'http.emptyAuth=auto' configuration now correctly attempts Negotiate authentication before falling back to manual credentials. This allows seamless Kerberos ticket-based authentication without requiring users to explicitly set 'http.emptyAuth=true'. Will merge to 'master'. source: source: * en/batch-prefetch (2026-04-17) 3 commits - grep: prefetch necessary blobs - builtin/log: prefetch necessary blobs for `git cherry` - patch-ids.h: add missing trailing parenthesis in documentation comment 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. Expecting a reroll. cf. source: * en/diffstat-utf8-truncation-fix (2026-04-20) 1 commit - diff: fix out-of-bounds reads and NULL deref in diffstat UTF-8 truncation The computation to shorten the filenames shown in diffstat measured width of individual UTF-8 characters to add up, but forgot to take into account error cases (e.g., an invalid UTF-8 sequence, or a control character). Will merge to 'next'. source: * ps/odb-in-memory (2026-04-10) 18 commits - 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 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"). Need to wait for the base topioc. source: <20260410-b4-pks-odb-source-inmemory-v3-0-22fd0fad58fe@pks.im> * js/adjust-tests-to-explicitly-access-bare-repo (2026-04-26) 8 commits - safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES - status tests: filter `.gitconfig` from status output - ls-files tests: filter `.gitconfig` from `--others` output - t5601: restore `.gitconfig` after includeIf test - t1305: use `--git-dir=.` for bare repo in include cycle test - t1300: remove global config settings injected by test-lib.sh - t7900: do not let `$HOME/.gitconfig` interfere with XDG tests - test-lib: allow bare repository access when breaking changes are enabled Some tests assume that bare repository accesses are by default allowed; rewrite some of them to avoid the assumption, rewrite others to explicitly set safe.bareRepository to allow them. Will merge to 'next'. source: * cl/conditional-config-on-worktree-path (2026-04-03) 2 commits - config: add "worktree" and "worktree/i" includeIf conditions - config: refactor include_by_gitdir() into include_by_path() The [includeIf "condition"] conditional inclusion facility for configuration files has learned to use the location of worktree in its condition. Needs review. cf. source: <20260403-includeif-worktree-v3-0-109ce5782b03@black-desk.cn> * 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. Will merge to 'next'. source: <20260427102838.44867-2-pabloosabaterr@gmail.com> * 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. source: * 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: <20260406183041.783800-1-vikingtc4@gmail.com> * jt/odb-transaction-write (2026-04-02) 7 commits - 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.) ODB transaction interface is being reworked to explicitly handle object writes. Needs leakfix. cf. <20260511175835.GA4811@coredump.intra.peff.net> source: <20260402213220.2651523-1-jltobler@gmail.com> * sa/cat-file-batch-mailmap-switch (2026-04-15) 1 commit - 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 'next'? source: <20260416033250.4327-2-siddharthasthana31@gmail.com> * tb/incremental-midx-part-3.3 (2026-04-29) 16 commits - 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 'next'. source: * 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: * ps/setup-wo-the-repository (2026-04-20) 18 commits - 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_git_dir()` - setup: stop using `the_repository` in `is_inside_worktree()` - setup: replace use of `the_repository` in static functions Many uses of the_repository has been updated to use a more appropriate struct repository instance in setup.c codepath. Needs review. source: <20260420-pks-setup-wo-the-repository-v1-0-f4a81c4988e8@pks.im> * 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. source: * ps/graph-lane-limit (2026-03-27) 3 commits - 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 'next'? cf. source: <20260328001113.1275291-1-pabloosabaterr@gmail.com> * jr/bisect-custom-terms-in-output (2026-04-17) 2 commits - rev-parse: use selected alternate terms to look up refs - bisect: use selected alternate terms in status output "git bisect" now uses the selected terms (e.g., old/new) more consistently in its output. Waiting for response(s) to review comment(s). cf. source: <20260417-bisect-terms-v3-0-d659fa547261@schlaraffenlan.de> * 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: <20260503153402.1333220-1-usmanakinyemi202@gmail.com> * hn/git-checkout-m-with-stash (2026-04-28) 5 commits (merged to 'next' on 2026-05-11 at 46adae5e5d) + checkout -m: autostash when switching branches + checkout: rollback lock on early returns in merge_working_tree + sequencer: teach autostash apply to take optional conflict marker labels + sequencer: allow create_autostash to run silently + stash: add --label-ours, --label-theirs, --label-base 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. Will merge to 'master'. source: * kh/name-rev-custom-format (2026-05-11) 5 commits (merged to 'next' on 2026-05-12 at c944d6131e) + format-rev: introduce builtin for on-demand pretty formatting + name-rev: make dedicated --annotate-stdin --name-only test + name-rev: factor code for sharing with a new command + name-rev: run clang-format before factoring code + name-rev: wrap both blocks in braces A new builtin "git format-rev" is introduced for pretty formatting one revision expression per line or commit object names found in running text. Will merge to 'master'. source: * 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. source: * 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: <20260305233452.3727126-8-gitster@pobox.com> * 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 - 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 'next'? cf. source: * pw/xdiff-shrink-memory-consumption (2026-05-04) 5 commits - 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 (this branch uses en/xdiff-cleanup-3.) Shrink wasted memory in Myers diff that does not account for common prefix and suffix removal. Will merge to 'next'. source: * en/xdiff-cleanup-3 (2026-04-29) 6 commits (merged to 'next' on 2026-05-12 at e4e72e0f34) + xdiff/xdl_cleanup_records: make execution of action easier to follow + xdiff/xdl_cleanup_records: make setting action easier to follow + xdiff/xdl_cleanup_records: make limits more clear + xdiff/xdl_cleanup_records: use unambiguous types + xdiff: use unambiguous types in xdl_bogo_sqrt() + xdiff/xdl_cleanup_records: delete local recs pointer (this branch is used by pw/xdiff-shrink-memory-consumption.) Preparation of the xdiff/ codebase to work with Rust. Will merge to 'master'. source: -------------------------------------------------- [Discarded] * 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. Dropped due to a long silence and inactivity. cf. source: * jt/config-lock-timeout (2026-04-03) 1 commit . config: retry acquiring config.lock for 100ms The code path to update the configuration file has been taught to use a short timeout to retry. Dropped due to a long silence and inactivity. cf. cf. source: <20260403100135.3901610-1-joerg@thalheim.io> * ab/clone-default-object-filter (2026-03-14) 1 commit . clone: add clone..defaultObjectFilter config "git clone" learns to pay attention to "clone..defaultObjectFilter" configuration and behave as if the "--filter=" option was given on the command line. Dropped due to a long silence and inactivity. cf. cf. source: