From: Junio C Hamano Date: Thu, 28 Apr 2022 19:20:38 +0000 (-0700) Subject: What's cooking (2022/04 #07) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b0c8f21deef031111fd055269990e38a37c70a5;p=thirdparty%2Fgit.git What's cooking (2022/04 #07) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 25e0d73911..39603f9d02 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, #06; Mon, 25) -X-master-at: 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e -X-next-at: b9c8b46e9451eb1f82393119d53aa151b6f7ff83 +Subject: What's cooking in git.git (Apr 2022, #07; Thu, 28) +X-master-at: 0f828332d5ac36fc63b7d8202652efa152809856 +X-next-at: e40c2bad7a72449dac987539a750bfb48c4d77c8 -What's cooking in git.git (Apr 2022, #06; Mon, 25) +What's cooking in git.git (Apr 2022, #07; Thu, 28) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -13,21 +13,10 @@ topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. -There are a handful of regressions we managed to sneak into the 2.36 -release that we need to fix before we can move forward. For some -reason, the release turned out to be unusually bad in the recent -history X-<. - -Here are what I know about, with or without fixes that have been -reviewed satisfactorily: - - - "diff-tree --stdin " loses after showing one - comparison. - cf. - - - "submodule update" without makes unnecessary noise - when skipping uninitialized submodules. - cf. +The 2.36 release unfortunately turned out to be a release with +unusually high number of regressions. We have dealt with a few of +them on the 'master' front already, and there are a few more whose +fixes have not been adequately reviewed or agreed upon. - hooks no longer is connected directly to the standard output. cf. @@ -35,11 +24,6 @@ reviewed satisfactorily: - "sudo make install" does not work out-of-the-box. cf. <4ef9287b-6260-9538-7c89-cffb611520ee@maurel.de> -And there are some that are not recent regressions: - - - "name-rev" frees some strings it still uses prematurely. - cf. - 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. @@ -68,9 +52,150 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ +-------------------------------------------------- +[Graduated to 'master'] + +* gc/submodule-update-part2 (2022-04-26) 1 commit + (merged to 'next' on 2022-04-26 at 673a597451) + + submodule--helper: fix initialization of warn_if_uninitialized + + "git submodule update" without pathspec should silently skip an + uninitialized submodule, but it started to become noisy by mistake. + + This fixes a regression in 2.36 and is slate to go to 2.36.1 + source: + + +* jc/diff-tree-stdin-fix (2022-04-26) 1 commit + (merged to 'next' on 2022-04-26 at acf23a19ac) + + 2.36 gitk/diff-tree --stdin regression fix + + "diff-tree --stdin" has been broken for about a year, but 2.36 + release broke it even worse by breaking running the command with + , which in turn broke "gitk" and got noticed. This has + been corrected by aligning its behaviour to that of "log". + + This fixes a regression in 2.36 and is slate to go to 2.36.1 + source: + + +* rs/name-rev-fix-free-after-use (2022-04-23) 1 commit + (merged to 'next' on 2022-04-26 at 975e329ff9) + + Revert "name-rev: release unused name strings" + + Regression fix for 2.36 where "git name-rev" started to sometimes + reference strings after they are freed. + + This fixes a regression in 2.36 and is slate to go to 2.36.1 + source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de> + -------------------------------------------------- [New Topics] +* ds/sparse-colon-path (2022-04-26) 5 commits + - rev-parse: integrate with sparse index + - object-name: diagnose trees in index properly + - object-name: reject trees found in the index + - show: integrate with the sparse index + - t1092: add compatibility tests for 'git show' + + "git show :" learned to work better with the sparse-index + feature. + + Will merge to 'next'? + source: + + +* cb/path-owner-check-with-sudo (2022-04-28) 3 commits + - t: add tests for safe.directory when running with sudo + - Documentation: explain how safe.directory works when running under sudo + - git-compat-util: avoid failing dir ownership checks if running privileged + + With a recent update to refuse access to repositories of other + people by default, "sudo make install" and "sudo git describe" + stopped working. This series intends to loosen it while keeping + the safety. + + source: <20220428105852.94449-1-carenas@gmail.com> + + +* pb/ggg-in-mfc-doc (2022-04-27) 3 commits + - MyFirstContribution: drop PR description for GGG single-patch contributions + - MyFirstContribution: also explain cover letter in GitGitGadget section + - MyFirstContribution: move cover letter description to a separate file + + Documentation update. + + Expecting a reroll. + cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com> + source: + + +* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits + - safe.directory: document and check that it's ignored in the environment + - t0033-safe-directory: check when 'safe.directory' is ignored + - t0033-safe-directory: check the error message without matching the trash dir + + New tests for the safe.directory mechanism. + + Will merge to 'next'. + source: <20220427170649.4949-1-szeder.dev@gmail.com> + +-------------------------------------------------- +[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/rebase-keep-base-fix (2022-04-21) 1 commit - rebase: use correct base for --keep-base when a branch is given @@ -121,7 +246,8 @@ Release tarballs are available at: source: -* cb/ci-make-p4-optional (2022-04-23) 5 commits +* cb/ci-make-p4-optional (2022-04-25) 6 commits + - fixup! ci: make failure to find perforce more user friendly - fixup! CI: use https, not http to download binaries from perforce.com - CI: use https, not http to download binaries from perforce.com - ci: reintroduce prevention from perforce being quarantined in macOS @@ -221,16 +347,6 @@ Release tarballs are available at: source: -* rs/name-rev-fix-free-after-use (2022-04-23) 1 commit - - Revert "name-rev: release unused name strings" - - Regression fix for 2.36 where "git name-rev" started to sometimes - reference strings after they are freed. - - Will merge to 'next' and then to 'master'. - source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de> - - * ds/do-not-call-bug-on-bad-refs (2022-04-25) 1 commit - clone: die() instead of BUG() on bad refs @@ -240,29 +356,7 @@ Release tarballs are available at: source: -* gc/submodule-update-part2 (2022-04-25) 2 commits - - SQUASH??? tests to protect the fix - - submodule--helper: fix initialization of warn_if_uninitialized - - "git submodule update" without pathspec should silently skip an - uninitialized submodule, but it started to become noisy by mistake. - - Will merge to 'next' and then to 'master'. - source: - - -* jc/diff-free-must-free-only-per-iteration-resources (2022-04-25) 2 commits - - t4013: diff-tree --stdin with pathspec - - 2.36 gitk/diff-tree --stdin regression fix - - "diff-tree --stdin " lost the pathspec for second and - later commits, which broke "gitk". - - Will merge to 'next' and then to 'master'. - source: - - -* vd/sparse-stash (2022-04-25) 7 commits +* vd/sparse-stash (2022-04-27) 7 commits - unpack-trees: preserve index sparsity - stash: merge applied stash with merge-ort - merge-recursive: add merge function arg to 'merge_recursive_generic' @@ -272,62 +366,9 @@ Release tarballs are available at: - stash: expand sparse-checkout compatibility testing Teach "git stash" to work better with sparse index entries. - source: --------------------------------------------------- -[Stalled] - -* ab/commit-plug-leaks (2022-02-16) 2 commits - - commit: use strbuf_release() instead of UNLEAK() - - commit: fix "author_ident" leak + source: - 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] * cm/reftable-0-length-memset (2022-04-15) 1 commit - reftable: avoid undefined behaviour breaking t0032