From: Junio C Hamano Date: Tue, 12 Apr 2022 08:23:45 +0000 (-0700) Subject: What's cooking (2022/04 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a081b42c76d3d342adf132d17c37a6374b4631bb;p=thirdparty%2Fgit.git What's cooking (2022/04 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 6eda96f317..3e5da5adaa 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2022, #02; Fri, 8) -X-master-at: ab1f2765f78e75ee51dface57e1071b3b7f42b09 -X-next-at: be66c8963cc046090ab0eb1f750e71f594a2a4e4 +Subject: What's cooking in git.git (Apr 2022, #03; Tue, 12) +X-master-at: 11cfe552610386954886543f5de87dcc49ad5735 +X-next-at: 64f902a358a9e80c900e2fb98bca7fe335154015 -What's cooking in git.git (Apr 2022, #02; Fri, 8) +What's cooking in git.git (Apr 2022, #03; Tue, 12) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -18,8 +18,11 @@ useful"). Do not read too much into a topic being in (or not in) 'seen'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -I just tagged Git 2.36-rc1; thank you, everybody, who reported and -fixed glitches in the -rc0 preview release. +Security releases for the 2.30-2.35 maintenance tracks have been +tagged to address CVE-2022-24765, where multi-user machines with a +shared "mob" directory a user can trick other users into running a +command of their choice easily. The fix has been merged up to Git +2.36-rc2 and also all integration branches above. 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 @@ -52,36 +55,95 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* bc/csprng-mktemps (2022-04-06) 1 commit - (merged to 'next' on 2022-04-06 at 5510589561) - + git-compat-util: really support openssl as a source of entropy +* ja/i18n-fix-for-2.36 (2022-04-11) 1 commit + (merged to 'next' on 2022-04-11 at 0953a117dc) + + i18n: fix some badly formatted i18n strings - Build fix. - source: <20220405042826.56vyilttx3lo4scv@carlos-mbp.lan> + Fixes to some localizable strings. + source: +-------------------------------------------------- +[New Topics] -* ld/sparse-index-bash-completion (2022-04-08) 1 commit - - t9902: split test to run on appropriate systems +* pw/test-malloc-with-sanitize-address (2022-04-11) 1 commit + - tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK - Test regression fix. - source: <20220408095353.11183-1-adam@dinwoodie.org> + Avoid problems from interaction between malloc_check and address + sanitizer. + Will merge to 'next'. + source: -* tl/ls-tree-oid-only (2022-04-08) 1 commit - - ls-tree doc: document interaction with submodules - Docfix. - source: +* rs/t7812-pcre2-ws-bug-test (2022-04-11) 1 commit + - t7812: test PCRE2 whitespace bug + + A test to ensure workaround for an earlier pcre2 bug does work. + + Will merge to 'next'. + source: <3a49649d-8ff9-e5a7-e3fd-33fee5068ae8@web.de> -------------------------------------------------- -[New Topics] +[Stalled] + +* ab/commit-plug-leaks (2022-02-16) 2 commits + - commit: use strbuf_release() instead of UNLEAK() + - commit: fix "author_ident" leak + + Leakfixes in the top-level called-once function. + + Expecting a reroll. + I think UNLEAK->strbuf_release() is a regression. + source: + + +* dl/prompt-pick-fix (2022-03-25) 1 commit + . git-prompt: fix sequencer/todo detection + + Fix shell prompt script (in contrib/) for those who set + rebase.abbreviateCommands; we failed to recognize that we were in a + multi-step cherry-pick session. + + Is this even needed? How? + cf. + source: <20220325145301.3370-1-danny0838@gmail.com> + + +* es/superproject-aware-submodules (2022-03-09) 3 commits + . rev-parse: short-circuit superproject worktree when config unset + . introduce submodule.hasSuperproject record + . t7400-submodule-basic: modernize inspect() helper + + A configuration variable in a repository tells if it is (or is not) + a submodule of a superproject. + + Expecting a reroll. + cf. + source: <20220310004423.2627181-1-emilyshaffer@google.com> + + +* cw/remote-object-info (2022-03-30) 5 commits + . fixup! transfer.advertiseObjectInfo: add object-info config + . fixup! object-info: add option for retrieving object info + . object-info: add option for retrieving object info + . transfer.advertiseObjectInfo: add object-info config + . fetch-pack: refactor packet writing and fetch options + + Attempt to add a client component to talk with object-info + endpoint. + + Expecting a reroll. + source: <20220328191112.3092139-1-calvinwan@google.com> + +-------------------------------------------------- +[Cooking] * ah/convert-warning-message (2022-04-08) 1 commit - convert: clarify line ending conversion warning Update a few end-user facing messages around eol conversion. - Will merge to 'next'? + Will merge to 'next'. source: <20220408044154.9947-1-alexhenrie24@gmail.com> @@ -100,7 +162,7 @@ Release tarballs are available at: Remove unused includes. - Will merge to 'next'? + Will merge to 'next'. source: <20220331194436.58005-1-garrit@slashdev.space> @@ -109,7 +171,7 @@ Release tarballs are available at: Test script updates. - Will merge to 'next'? + Will merge to 'next'. source: <20220405134742.17526-2-khalid.masum.92@gmail.com> @@ -118,7 +180,7 @@ Release tarballs are available at: Small code clean-up. - Will merge to 'next'? + Will merge to 'next'. source: @@ -128,7 +190,7 @@ Release tarballs are available at: The commit summary shown after making a commit is matched to what is given in "git status" not to use the break-rewrite heuristics. - Will merge to 'next'? + Will merge to 'next'. source: @@ -137,7 +199,7 @@ Release tarballs are available at: "git p4" update. - Will merge to 'next'? + Will merge to 'next'. source: @@ -146,7 +208,7 @@ Release tarballs are available at: "git p4" update. - Will merge to 'next'? + Will merge to 'next'. source: @@ -155,51 +217,11 @@ Release tarballs are available at: - run-command API: rename "env_array" to "env" - cocci: add a rename of "struct child_process"'s "env_array" to "env" - source: - --------------------------------------------------- -[Stalled] - -* dl/prompt-pick-fix (2022-03-25) 1 commit - - git-prompt: fix sequencer/todo detection - - Fix shell prompt script (in contrib/) for those who set - rebase.abbreviateCommands; we failed to recognize that we were in a - multi-step cherry-pick session. - - Is this even needed? How? - cf. - source: <20220325145301.3370-1-danny0838@gmail.com> - - -* es/superproject-aware-submodules (2022-03-09) 3 commits - . rev-parse: short-circuit superproject worktree when config unset - . introduce submodule.hasSuperproject record - . t7400-submodule-basic: modernize inspect() helper - - A configuration variable in a repository tells if it is (or is not) - a submodule of a superproject. - - Expecting a reroll. - cf. - source: <20220310004423.2627181-1-emilyshaffer@google.com> - - -* cw/remote-object-info (2022-03-30) 5 commits - . fixup! transfer.advertiseObjectInfo: add object-info config - . fixup! object-info: add option for retrieving object info - . object-info: add option for retrieving object info - . transfer.advertiseObjectInfo: add object-info config - . fetch-pack: refactor packet writing and fetch options - - Attempt to add a client component to talk with object-info - endpoint. + Rename .env_array member to .env in the child_process structure. - Expecting a reroll. - source: <20220328191112.3092139-1-calvinwan@google.com> + On hold. + source: --------------------------------------------------- -[Cooking] * ab/misc-cleanup (2022-04-01) 6 commits (merged to 'next' on 2022-04-04 at c5fb674865) @@ -222,7 +244,7 @@ Release tarballs are available at: "git -v" and "git -h" are now understood as "git --version" and "git --help". - Will merge to 'next'? + Will merge to 'next'. source: <20220331212709.36036-1-garrit@slashdev.space> @@ -269,6 +291,8 @@ Release tarballs are available at: Plug the memory leaks from the trickiest API of all, the revision walker. + + Will merge to 'next'? source: @@ -285,7 +309,7 @@ Release tarballs are available at: Build a moral equivalent of js/ci-github-workflow-markup on top of ab/ci-setup-simplify. - Waiting for discussion to settle. + How does this compare feature-wise with js/ci-github-workflow-markup? source: @@ -320,7 +344,10 @@ Release tarballs are available at: Drive more actions done in CI via the Makefile instead of shell commands sprinkled in .github/workflows/main.yml - Waiting for discussion to settle. + Unless "doing more in Makefile" is fundamentally undesirable, I am + inclined to take this, together with ab/ci-github-workflow-markup + to replace js/ci-github-workflow-markup + cf. source: @@ -347,7 +374,7 @@ Release tarballs are available at: source: <20220330191909.294610-1-greenfoo@u92.eu> -* bc/stash-export (2022-04-03) 4 commits +* bc/stash-export (2022-04-08) 4 commits - builtin/stash: provide a way to import stashes from a ref - builtin/stash: provide a way to export stashes to a ref - builtin/stash: factor out revision parsing into a function @@ -357,7 +384,7 @@ Release tarballs are available at: commit to transfer it across repositories has been introduced. Will merge to 'next'? - source: <20220403182250.904933-1-sandals@crustytoothpaste.net> + source: <20220407215352.3491567-1-sandals@crustytoothpaste.net> * ns/batch-fsync (2022-04-06) 13 commits @@ -394,6 +421,9 @@ Release tarballs are available at: - sparse-checkout: make --cone the default - tests: stop assuming --no-cone is the default mode for sparse-checkout + Deprecate non-cone mode of the sparse-checkout feature. + + Will merge to 'next'? source: @@ -490,17 +520,6 @@ Release tarballs are available at: source: -* ab/commit-plug-leaks (2022-02-16) 2 commits - - commit: use strbuf_release() instead of UNLEAK() - - commit: fix "author_ident" leak - - Leakfixes in the top-level called-once function. - - Expecting a reroll. - I think UNLEAK->strbuf_release() is a regression. - source: - - * jh/builtin-fsmonitor-part3 (2022-03-25) 28 commits - t7527: test Unicode NFC/NFD handling on MacOS - t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd