From: Junio C Hamano Date: Mon, 2 May 2022 18:18:26 +0000 (-0700) Subject: What's cooking (2022/05 #01) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a9c1efd6406a7c5a6a2ab2da0678ed3eadddf8d;p=thirdparty%2Fgit.git What's cooking (2022/05 #01) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 39603f9d02..298a5bcaa0 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, #07; Thu, 28) +Subject: What's cooking in git.git (May 2022, #01; Mon, 2) X-master-at: 0f828332d5ac36fc63b7d8202652efa152809856 X-next-at: e40c2bad7a72449dac987539a750bfb48c4d77c8 -What's cooking in git.git (Apr 2022, #07; Thu, 28) +What's cooking in git.git (May 2022, #01; Mon, 2) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -15,8 +15,9 @@ and aren't considered "accepted" at all. 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. +them on the 'master' front already, there are a few that look simple +and obvious that should graduate before 2.36.1, but 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. @@ -53,93 +54,93 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] +[New Topics] -* 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 +* ep/equals-null-cocci (2022-05-02) 2 commits + - tree-wide: apply equals-null.cocci + - Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci + (this branch uses ep/maint-equals-null-cocci.) - "git submodule update" without pathspec should silently skip an - uninitialized submodule, but it started to become noisy by mistake. + Merges up ep/maint-equals-null-cocci to the current codebase. - This fixes a regression in 2.36 and is slate to go to 2.36.1 - source: + Will merge to 'next'? -* 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 +* ep/maint-equals-null-cocci (2022-05-02) 4 commits + - tree-wide: apply equals-null.cocci + - Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 + - tree-wide: apply equals-null.cocci + - contrib/coccinnelle: add equals-null.cocci + (this branch is used by ep/equals-null-cocci.) - "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". + Introduce and apply coccinelle rule to discourage an explicit + comparison between a pointer and NULL, and applies the clean-up to + the maintenance track. - This fixes a regression in 2.36 and is slate to go to 2.36.1 - source: + Will merge to 'next'? -* 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" +* jc/clone-remote-name-leak-fix (2022-04-30) 1 commit + - clone: plug a miniscule leak - Regression fix for 2.36 where "git name-rev" started to sometimes - reference strings after they are freed. + "git clone --origin X" leaked piece of memory that held value read + from the clone.defaultRemoteName configuration variable, which has + been plugged. - This fixes a regression in 2.36 and is slate to go to 2.36.1 - source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de> + Will merge to 'next'. + source: --------------------------------------------------- -[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' +* jc/cocci-xstrdup-or-null-fix (2022-04-30) 1 commit + - cocci: drop bogus xstrdup_or_null() rule - "git show :" learned to work better with the sparse-index - feature. + Get rid of a bogus and over-eager coccinelle rule. - Will merge to 'next'? - source: + 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 +* js/wait-or-whine-can-fail (2022-04-28) 1 commit + - run-command: don't spam trace2_child_exit() - 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. + We used to log an error return from wait_or_whine() as process + termination of the waited child, which was incorrect. - source: <20220428105852.94449-1-carenas@gmail.com> + Needs clarifying "in rare cases". + source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.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 +* jc/show-pathspec-fix (2022-04-29) 1 commit + - 2.36 show regression fix - Documentation update. + "git show ... -- " lost the pathspec + when showing the second and subsequent commits, which has been + corrected. - Expecting a reroll. - cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com> - source: + Will merge to 'next' and then to 'master'. + 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 +* rs/format-patch-pathspec-fix (2022-04-30) 1 commit + - 2.36 format-patch regression fix - New tests for the safe.directory mechanism. + "git format-patch -- " lost the pathspec when + showing the second and subsequent commits, which has been + corrected. + + Will merge to 'next' and then to 'master'. + source: + + +* rs/fast-export-pathspec-fix (2022-04-30) 1 commit + - 2.36 fast-export regression fix + + "git fast-export -- " lost the pathspec when showing the + second and subsequent commits, which has been corrected. + + Will merge to 'next' and then to 'master'. + source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de> - Will merge to 'next'. - source: <20220427170649.4949-1-szeder.dev@gmail.com> -------------------------------------------------- [Stalled] @@ -196,6 +197,55 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] +* 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> + + * ah/rebase-keep-base-fix (2022-04-21) 1 commit - rebase: use correct base for --keep-base when a branch is given @@ -366,7 +416,6 @@ Release tarballs are available at: - stash: expand sparse-checkout compatibility testing Teach "git stash" to work better with sparse index entries. - source: @@ -761,14 +810,18 @@ Release tarballs are available at: source: <20220217225408.GB7@edef91d97c94> -* tk/simple-autosetupmerge (2022-04-22) 1 commit - - merge: new autosetupmerge option 'simple' for matching branches +* tk/simple-autosetupmerge (2022-04-29) 3 commits + - push: new config option "push.autoSetupRemote" supports "simple" push + - push: default to single remote even when not named origin + - branch: new autosetupmerge option 'simple' for matching branches "git -c branch.autosetupmerge=simple branch $A $B" will set the $B as $A's upstream only when $A and $B shares the same name, and "git -c push.default=simple" on branch $A would push to update the - branch $A at the remote $B came from. - source: + branch $A at the remote $B came from. Also more places use the + sole remote, if exists, before defaulting to 'origin'. + + source: * tk/untracked-cache-with-uall (2022-04-01) 2 commits