From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) (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 496711FDA61 for ; Mon, 18 May 2026 01:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.155 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779067928; cv=none; b=KzXOBsB0QaG1gjpKhHpHB5oLNJh/yo8z92rdy5XPuXCG0IJ72o4IgqARyexvKmurDjtPoNkukPLRjSuC9xUupUuBVL2FbcBW1WB7wB5advW6ZOz/uyTExCNjx1ZUVR3WBlW8gu7Atzf3xi21F3eHS6n2Zc7MFjFz9I0PF8hTA74= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779067928; c=relaxed/simple; bh=+9Lqv9CyWa/Pw2CY+HpbR5JpVWDx8I5p1B8SbJBKTMg=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=XcyLX7asi4HwC6yE5pV97rkIGcpnLN7WUKm5w2G10ELryX7IljtJeb7FWqSVmlaNzB6UJxh04agSS/lQcuxam/DOI1zi5I6PY1iZ4o25wJl6G4Hiq9Jin1HaGkRtOGwdvMi7uDNxJa04MuzMuzx1hmCKHcSVvVIEckjZKw4uvAY= 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=vCO/Hy0h; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=Y+dQOA3n; arc=none smtp.client-ip=103.168.172.155 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="vCO/Hy0h"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Y+dQOA3n" Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.phl.internal (Postfix) with ESMTP id 723051400074; Sun, 17 May 2026 21:32:03 -0400 (EDT) Received: from phl-frontend-01 ([10.202.2.160]) by phl-compute-04.internal (MEProxy); Sun, 17 May 2026 21:32:03 -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=1779067923; x=1779154323; bh=Z/S1S9NqoU dM4qsEb8rgdu/jPy5+vQ2/DaVVtpceCFo=; b=vCO/Hy0hxpddYrU0ybYLd2wLic tHiJEBFS4fIyxjT/YeNcP5zvlfkedZffySG3T8vlI4MbIJ1nZY1g/pPRTTcuMZva GvkvQmDsdO8mQnQIgkzW0WGJpr3GNRGJPz2xF/iTgKNDCzLv7kd+G3+xwW1z0aBh W0s1LC61f/x94bv1pXvQGjVFH3nzPGwpwyh6rmlAQZSuIXS19oxwcJmoMQibwA3T VKjgl378Iue6tuy0GeI5+K7MV1tRw/a0tgJ6FIDrIiaib9ZoMJFUEBRGq0UA04ke JMToQCA7W7MGjQ2CRuzBOpBmiOJhvhy8nYm9pI+kKxMHF7tgnBoQxoT8ffgQ== 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= 1779067923; x=1779154323; bh=Z/S1S9NqoUdM4qsEb8rgdu/jPy5+vQ2/DaV VtpceCFo=; b=Y+dQOA3nLD91yhoa07aoSw5lKoyyBeRaMF7MAPg5ViTBDGo3jNp PxVV2FOsoh20QFitF0NGi+Rn/Md2V6VfT6MYDlnBMiSNVQt6TUPm96nqUw9icgLO nufz1gzies8iHQX28UHQpZDcSFab5+nWCTqLHBPOPA42hTPZzLw9e25BzHbY2mQp ioNh9MJhqyDmVhyh33PJDzEFTs4Yvsia3LnEBs/WYKDe2srSrNMHc84Kn3dFyjgx eUE7ITyTGhVMjL5B6JVlYgLcXzeJsL3UZxg0rMn3V2aX7mWXhGmQB0ftjLBVffGo He0DUCEjhaHGRzDWSqvjwX/0YLoZ7jfz2nQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgddufeejheeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucgfrhhlucfvnfffucdliedmnecujfgurhephffvufffkf gfgggtgfesthekredttderjeenucfhrhhomheplfhunhhiohcuvecujfgrmhgrnhhouceo ghhithhsthgvrhesphhosghogidrtghomheqnecuggftrfgrthhtvghrnheptdegudfhve fffeejvdfhtefhuefhfeffteefgefgteefleeutedvvdejhfdvtedunecuffhomhgrihhn pehkvghrnhgvlhdrohhrghdpohhrrdgtiidpghhoohhglhgvshhouhhrtggvrdgtohhmpd hgihhthhhusgdrtghomhdpghhithhlrggsrdgtohhmpdgvgigrmhhplhgvrdgtohhmnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhithhsth gvrhesphhosghogidrtghomhdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphho uhhtpdhrtghpthhtohepghhithesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtth hopehlfihnsehlfihnrdhnvghtpdhrtghpthhtohepghhithhsthgvrhesphhosghogidr tghomh X-ME-Proxy: Feedback-ID: if26b431b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 17 May 2026 21:32:02 -0400 (EDT) From: Junio C Hamano To: git@vger.kernel.org Subject: What's cooking in git.git (May 2026, #04) X-master-at: 68aca6b91299738150f71035d0033af6987fe455 X-next-at: 3ed373ac14709745ea457f6c3c005a959506b723 Date: Mon, 18 May 2026 10:32:01 +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). 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'] * 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. cf. <6e95b82a-19e3-460e-86f7-f899c2df261d@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. source: * 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. 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. source: <576d29f15e016889e02c253713656cd8cbf1f04c.1776894255.git.mroik@delayed.space> * 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.. 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. source: * 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. source: <9bd69678-f04b-41d2-ad74-a386820d34c8@web.de> * 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. cf. source: <20260421053334.5414-1-r.siddharth.shrimali@gmail.com> -------------------------------------------------- [New Topics] * hn/status-pull-advice-qualified (2026-05-13) 1 commit - remote: qualify "git pull" advice for non-upstream branches 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 ". Comments? source: * 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: <20260512162619.GA69813@coredump.intra.peff.net> * 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: <20260512162022.GA69669@coredump.intra.peff.net> * kk/merge-octopus-optim (2026-05-11) 1 commit - 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. Comments? source: * 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: <20260512115603.80780-1-l.s.r@web.de> * ta/approxidate-noon-fix (2026-05-16) 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. Comments? source: <20260516151540.9611-1-taahol@utu.fi> * 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: * 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: <183aa0fd-d455-4ec9-9c42-d511fac8b3e4@web.de> * kk/limit-list-optim (2026-05-14) 1 commit - 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 'next'. source: * ed/check-connected-close-err-fd (2026-05-16) 1 commit - 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 'next'? (this branch uses ed/check-connected-close-err-fd-2.53.) * ed/check-connected-close-err-fd-2.53 (2026-05-14) 1 commit - 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 be merged together with ed/check-connected-close-err-fd topic. source: * jk/apply-leakfix (2026-05-15) 1 commit - apply: plug leak on "patch too large" error Leakfix. Will merge to 'next'. source: <20260516021622.GA744303@coredump.intra.peff.net> * jk/commit-sign-overflow-fix (2026-05-15) 1 commit - commit: handle large commit messages in utf8 verification Leakfix. Will merge to 'next'. source: <20260516022310.GB744303@coredump.intra.peff.net> * kk/tips-reachable-from-bases-optim (2026-05-16) 2 commits - 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 'next'? source: * pb/doc-diff-format-updates (2026-05-15) 3 commits - 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 'next'. source: * ps/t3903-cover-stash-include-untracked (2026-05-16) 1 commit - stash: add coverage for show --include-untracked Test coverage has been added to "git stash --include-untracked". Will merge to 'next'. source: <20260516183347.4323-2-pushkarkumarsingh1970@gmail.com> * rs/trailer-fold-optim (2026-05-15) 1 commit - trailer: change strbuf in-place in unfold_value() Code simplification. Will merge to 'next'. source: <816be07e-2cd6-48fe-ae93-57fa0f2543ed@web.de> * rs/use-builtin-add-overflow-explicitly-on-clang (2026-05-14) 2 commits - 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. What's the status of this topic? source: <0ded6062-f66a-4713-af24-d1b5aa654823@web.de> source: * tc/generate-configlist-fix-for-older-ninja (2026-05-15) 1 commit - generate-configlist: collapse depfile for older Ninja Build update. Will merge to 'next'? source: <20260515-toon-fix-almalinux8-v3-1-b545a0647f0f@iotcl.com> * 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: * 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: * kn/refs-fsck-skip-lock-files (2026-05-17) 1 commit - 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 'next'. source: <20260517-refs-fsck-skip-lock-files-v3-1-b24dfd673c7e@gmail.com> * 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. source: <20260517132111.1014901-1-joerg@thalheim.io> -------------------------------------------------- [Cooking] * 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=" in a full clone truncated the history to commits deep, which has been corrected to be a no-op instead. Will merge to 'master'. source: <20260511192044.169557-1-samo_pogacnik@t-2.net> * 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. source: * ps/maintenance-daemonize-lockfix (2026-05-13) 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: <20260513-pks-maintenance-fix-lock-with-detach-v3-0-f27a1ac82891@pks.im> * js/mingw-no-nedmalloc (2026-05-08) 3 commits (merged to 'next' on 2026-05-13 at 2116a6bcc9) + 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 'master'. 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 (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. Will merge to 'master'. source: <20260505091941.1825-2-aminnimaj@gmail.com> * hn/branch-prune-merged (2026-05-13) 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. Comments? 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-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: * 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". Will merge to 'master'. cf. cf. <20260512085734.GA26769@tb-raspi4> 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-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. source: * 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: * 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. 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 (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 (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 'master'. 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 (merged to 'next' on 2026-05-13 at c7cd30d414) + alias: restore support for simple dotted aliases Further update to the i18n alias support to avoid regressions. Will merge to 'master'. source: <20260424161707.1514255-1-jonatan@jontes.page> * 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. Will merge to 'master'. 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 (merged to 'next' on 2026-05-13 at e6154b6272) + 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 'master'. cf. source: <20260427-b4-pks-history-fixup-v3-0-cb908f06264b@pks.im> * sb/unpack-index-pack-buffer-resize (2026-04-28) 1 commit (merged to 'next' on 2026-05-13 at 2edd54bcfe) + 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 'master'. cf. source: * bc/sign-commit-with-custom-encoding (2026-04-27) 2 commits (merged to 'next' on 2026-05-13 at e82a4966c0) + 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 'master'. 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 (merged to 'next' on 2026-05-13 at 843d2ac470) + 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 'master'. source: * 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. Will merge to 'master'. cf. source: * 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. Will merge to 'master'. 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-15) 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. Will merge to 'next'? source: <463cc8e2764edb7de3d379f615f5cfbd0919bfa3.1778887662.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: * 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: * 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: * 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: * 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-05-14) 8 commits - 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. Comments? 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-05-14) 4 commits - 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. Comments? source: * en/diffstat-utf8-truncation-fix (2026-04-20) 1 commit (merged to 'next' on 2026-05-13 at adf801eb1d) + 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 'master'. 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 topic. 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 (merged to 'next' on 2026-05-13 at 48695e1cb0) + 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 'master'. source: * cl/conditional-config-on-worktree-path (2026-05-13) 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. Will merge to 'next'? cf. <2989eb07-2933-4b5a-9e5c-33ef9b805528@gmail.com> source: <20260513-includeif-worktree-v4-0-f8e6212d1fba@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. Waiting for response(s) to review comment(s). cf. <20260513230216.GA1378627@coredump.intra.peff.net> 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-05-14) 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. Will merge to 'next'? source: <20260514183740.1505171-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. Waiting for response(s) to review comment(s). cf. cf. <20260513230825.GA1378716@coredump.intra.peff.net> 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-05-14) 3 commits - 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 'next'? source: <20260514-bisect-terms-v4-0-b3e3cf1b06ce@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. Waiting for response(s) to review comment(s). cf. source: <20260503153402.1333220-1-usmanakinyemi202@gmail.com> * 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 (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 (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 'master'. 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: