What's cooking (2022/05 #01)
Junio C Hamano committed
May 2, 2022 at 11:18 UTC
1a9c1efd6406a7c5a6a2ab2da0678ed3eadddf8d
1 file changed
+122
-69
whats-cooking.txt
+122
-69
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2022, #07; Thu, 28)
3
+Subject: What's cooking in git.git (May 2022, #01; Mon, 2)
4
X-master-at: 0f828332d5ac36fc63b7d8202652efa152809856
5
X-next-at: e40c2bad7a72449dac987539a750bfb48c4d77c8
6
7
-What's cooking in git.git (Apr 2022, #07; Thu, 28)
7
+What's cooking in git.git (May 2022, #01; Mon, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -15,8 +15,9 @@ and aren't considered "accepted" at all.
15
16
The 2.36 release unfortunately turned out to be a release with
17
unusually high number of regressions. We have dealt with a few of
18
-them on the 'master' front already, and there are a few more whose
19
-fixes have not been adequately reviewed or agreed upon.
18
+them on the 'master' front already, there are a few that look simple
19
+and obvious that should graduate before 2.36.1, but there are a few
20
+more whose fixes have not been adequately reviewed or agreed upon.
21
22
- hooks no longer is connected directly to the standard output.
23
cf. <CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com>
@@ -53,93 +54,93 @@ Release tarballs are available at:
54
https://www.kernel.org/pub/software/scm/git/
55
56
--------------------------------------------------
56
-[Graduated to 'master']
57
+[New Topics]
58
58
-* gc/submodule-update-part2 (2022-04-26) 1 commit
59
- (merged to 'next' on 2022-04-26 at 673a597451)
60
- + submodule--helper: fix initialization of warn_if_uninitialized
59
+* ep/equals-null-cocci (2022-05-02) 2 commits
60
+ - tree-wide: apply equals-null.cocci
61
+ - Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
62
+ (this branch uses ep/maint-equals-null-cocci.)
63
62
- "git submodule update" without pathspec should silently skip an
63
- uninitialized submodule, but it started to become noisy by mistake.
64
+ Merges up ep/maint-equals-null-cocci to the current codebase.
65
65
- This fixes a regression in 2.36 and is slate to go to 2.36.1
66
- source: <pull.1258.v2.git.git.1650890741430.gitgitgadget@gmail.com>
66
+ Will merge to 'next'?
67
68
69
-* jc/diff-tree-stdin-fix (2022-04-26) 1 commit
70
- (merged to 'next' on 2022-04-26 at acf23a19ac)
71
- + 2.36 gitk/diff-tree --stdin regression fix
69
+* ep/maint-equals-null-cocci (2022-05-02) 4 commits
70
+ - tree-wide: apply equals-null.cocci
71
+ - Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
72
+ - tree-wide: apply equals-null.cocci
73
+ - contrib/coccinnelle: add equals-null.cocci
74
+ (this branch is used by ep/equals-null-cocci.)
75
73
- "diff-tree --stdin" has been broken for about a year, but 2.36
74
- release broke it even worse by breaking running the command with
75
- <pathspec>, which in turn broke "gitk" and got noticed. This has
76
- been corrected by aligning its behaviour to that of "log".
76
+ Introduce and apply coccinelle rule to discourage an explicit
77
+ comparison between a pointer and NULL, and applies the clean-up to
78
+ the maintenance track.
79
78
- This fixes a regression in 2.36 and is slate to go to 2.36.1
79
- source: <xmqq7d7bsu2n.fsf@gitster.g>
80
+ Will merge to 'next'?
81
82
82
-* rs/name-rev-fix-free-after-use (2022-04-23) 1 commit
83
- (merged to 'next' on 2022-04-26 at 975e329ff9)
84
- + Revert "name-rev: release unused name strings"
83
+* jc/clone-remote-name-leak-fix (2022-04-30) 1 commit
84
+ - clone: plug a miniscule leak
85
86
- Regression fix for 2.36 where "git name-rev" started to sometimes
87
- reference strings after they are freed.
86
+ "git clone --origin X" leaked piece of memory that held value read
87
+ from the clone.defaultRemoteName configuration variable, which has
88
+ been plugged.
89
89
- This fixes a regression in 2.36 and is slate to go to 2.36.1
90
- source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de>
90
+ Will merge to 'next'.
91
+ source: <xmqqlevl4ysk.fsf@gitster.g>
92
92
---------------------------------------------------
93
-[New Topics]
93
95
-* ds/sparse-colon-path (2022-04-26) 5 commits
96
- - rev-parse: integrate with sparse index
97
- - object-name: diagnose trees in index properly
98
- - object-name: reject trees found in the index
99
- - show: integrate with the sparse index
100
- - t1092: add compatibility tests for 'git show'
94
+* jc/cocci-xstrdup-or-null-fix (2022-04-30) 1 commit
95
+ - cocci: drop bogus xstrdup_or_null() rule
96
102
- "git show :<path>" learned to work better with the sparse-index
103
- feature.
97
+ Get rid of a bogus and over-eager coccinelle rule.
98
105
- Will merge to 'next'?
106
- source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
99
+ Will merge to 'next'.
100
+ source: <xmqq1qxd6e4x.fsf@gitster.g>
101
102
109
-* cb/path-owner-check-with-sudo (2022-04-28) 3 commits
110
- - t: add tests for safe.directory when running with sudo
111
- - Documentation: explain how safe.directory works when running under sudo
112
- - git-compat-util: avoid failing dir ownership checks if running privileged
103
+* js/wait-or-whine-can-fail (2022-04-28) 1 commit
104
+ - run-command: don't spam trace2_child_exit()
105
114
- With a recent update to refuse access to repositories of other
115
- people by default, "sudo make install" and "sudo git describe"
116
- stopped working. This series intends to loosen it while keeping
117
- the safety.
106
+ We used to log an error return from wait_or_whine() as process
107
+ termination of the waited child, which was incorrect.
108
119
- source: <20220428105852.94449-1-carenas@gmail.com>
109
+ Needs clarifying "in rare cases".
110
+ source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
111
112
122
-* pb/ggg-in-mfc-doc (2022-04-27) 3 commits
123
- - MyFirstContribution: drop PR description for GGG single-patch contributions
124
- - MyFirstContribution: also explain cover letter in GitGitGadget section
125
- - MyFirstContribution: move cover letter description to a separate file
113
+* jc/show-pathspec-fix (2022-04-29) 1 commit
114
+ - 2.36 show regression fix
115
127
- Documentation update.
116
+ "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
117
+ when showing the second and subsequent commits, which has been
118
+ corrected.
119
129
- Expecting a reroll.
130
- cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com>
131
- source: <pull.1226.git.1651086288.gitgitgadget@gmail.com>
120
+ Will merge to 'next' and then to 'master'.
121
+ source: <xmqqo80j87g0.fsf_-_@gitster.g>
122
123
134
-* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
135
- - safe.directory: document and check that it's ignored in the environment
136
- - t0033-safe-directory: check when 'safe.directory' is ignored
137
- - t0033-safe-directory: check the error message without matching the trash dir
124
+* rs/format-patch-pathspec-fix (2022-04-30) 1 commit
125
+ - 2.36 format-patch regression fix
126
139
- New tests for the safe.directory mechanism.
127
+ "git format-patch <args> -- <pathspec>" lost the pathspec when
128
+ showing the second and subsequent commits, which has been
129
+ corrected.
130
+
131
+ Will merge to 'next' and then to 'master'.
132
+ source: <c36896a1-6247-123b-4fa3-b7eb24af1897@web.de>
133
+
134
+
135
+* rs/fast-export-pathspec-fix (2022-04-30) 1 commit
136
+ - 2.36 fast-export regression fix
137
+
138
+ "git fast-export -- <pathspec>" lost the pathspec when showing the
139
+ second and subsequent commits, which has been corrected.
140
+
141
+ Will merge to 'next' and then to 'master'.
142
+ source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de>
143
141
- Will merge to 'next'.
142
- source: <20220427170649.4949-1-szeder.dev@gmail.com>
144
145
--------------------------------------------------
146
[Stalled]
@@ -196,6 +197,55 @@ Release tarballs are available at:
197
--------------------------------------------------
198
[Cooking]
199
200
+* ds/sparse-colon-path (2022-04-26) 5 commits
201
+ - rev-parse: integrate with sparse index
202
+ - object-name: diagnose trees in index properly
203
+ - object-name: reject trees found in the index
204
+ - show: integrate with the sparse index
205
+ - t1092: add compatibility tests for 'git show'
206
+
207
+ "git show :<path>" learned to work better with the sparse-index
208
+ feature.
209
+
210
+ Will merge to 'next'?
211
+ source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
212
+
213
+
214
+* cb/path-owner-check-with-sudo (2022-04-28) 3 commits
215
+ - t: add tests for safe.directory when running with sudo
216
+ - Documentation: explain how safe.directory works when running under sudo
217
+ - git-compat-util: avoid failing dir ownership checks if running privileged
218
+
219
+ With a recent update to refuse access to repositories of other
220
+ people by default, "sudo make install" and "sudo git describe"
221
+ stopped working. This series intends to loosen it while keeping
222
+ the safety.
223
+ source: <20220428105852.94449-1-carenas@gmail.com>
224
+
225
+
226
+* pb/ggg-in-mfc-doc (2022-04-27) 3 commits
227
+ - MyFirstContribution: drop PR description for GGG single-patch contributions
228
+ - MyFirstContribution: also explain cover letter in GitGitGadget section
229
+ - MyFirstContribution: move cover letter description to a separate file
230
+
231
+ Documentation update.
232
+
233
+ Expecting a reroll.
234
+ cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com>
235
+ source: <pull.1226.git.1651086288.gitgitgadget@gmail.com>
236
+
237
+
238
+* sg/safe-directory-tests-and-docs (2022-04-27) 3 commits
239
+ - safe.directory: document and check that it's ignored in the environment
240
+ - t0033-safe-directory: check when 'safe.directory' is ignored
241
+ - t0033-safe-directory: check the error message without matching the trash dir
242
+
243
+ New tests for the safe.directory mechanism.
244
+
245
+ Will merge to 'next'.
246
+ source: <20220427170649.4949-1-szeder.dev@gmail.com>
247
+
248
+
249
* ah/rebase-keep-base-fix (2022-04-21) 1 commit
250
- rebase: use correct base for --keep-base when a branch is given
251
@@ -366,7 +416,6 @@ Release tarballs are available at:
416
- stash: expand sparse-checkout compatibility testing
417
418
Teach "git stash" to work better with sparse index entries.
369
-
419
source: <pull.1171.v2.git.1651083378.gitgitgadget@gmail.com>
420
421
@@ -761,14 +810,18 @@ Release tarballs are available at:
810
source: <20220217225408.GB7@edef91d97c94>
811
812
764
-* tk/simple-autosetupmerge (2022-04-22) 1 commit
765
- - merge: new autosetupmerge option 'simple' for matching branches
813
+* tk/simple-autosetupmerge (2022-04-29) 3 commits
814
+ - push: new config option "push.autoSetupRemote" supports "simple" push
815
+ - push: default to single remote even when not named origin
816
+ - branch: new autosetupmerge option 'simple' for matching branches
817
818
"git -c branch.autosetupmerge=simple branch $A $B" will set the $B
819
as $A's upstream only when $A and $B shares the same name, and "git
820
-c push.default=simple" on branch $A would push to update the
770
- branch $A at the remote $B came from.
771
- source: <pull.1161.v4.git.1647843442911.gitgitgadget@gmail.com>
821
+ branch $A at the remote $B came from. Also more places use the
822
+ sole remote, if exists, before defaulting to 'origin'.
823
+
824
+ source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
825
826
827
* tk/untracked-cache-with-uall (2022-04-01) 2 commits