What's cooking (2022/04 #07)
Junio C Hamano committed
Apr 28, 2022 at 12:20 UTC
5b0c8f21deef031111fd055269990e38a37c70a5
1 file changed
+153
-112
whats-cooking.txt
+153
-112
@@ -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, #06; Mon, 25)
4
-X-master-at: 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
5
-X-next-at: b9c8b46e9451eb1f82393119d53aa151b6f7ff83
3
+Subject: What's cooking in git.git (Apr 2022, #07; Thu, 28)
4
+X-master-at: 0f828332d5ac36fc63b7d8202652efa152809856
5
+X-next-at: e40c2bad7a72449dac987539a750bfb48c4d77c8
6
7
-What's cooking in git.git (Apr 2022, #06; Mon, 25)
7
+What's cooking in git.git (Apr 2022, #07; Thu, 28)
8
--------------------------------------------------
9
10
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
13
future release). Commits prefixed with '-' are only in 'seen',
14
and aren't considered "accepted" at all.
15
16
-There are a handful of regressions we managed to sneak into the 2.36
17
-release that we need to fix before we can move forward. For some
18
-reason, the release turned out to be unusually bad in the recent
19
-history X-<.
20
-
21
-Here are what I know about, with or without fixes that have been
22
-reviewed satisfactorily:
23
-
24
- - "diff-tree --stdin <pathspec>" loses <pathspec> after showing one
25
- comparison.
26
- cf. <xmqqbkwpvyyc.fsf@gitster.g>
27
-
28
- - "submodule update" without <pathspec> makes unnecessary noise
29
- when skipping uninitialized submodules.
30
- cf. <pull.1258.v2.git.git.1650890741430.gitgitgadget@gmail.com>
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.
20
21
- hooks no longer is connected directly to the standard output.
22
cf. <CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com>
@@ -35,11 +24,6 @@ reviewed satisfactorily:
24
- "sudo make install" does not work out-of-the-box.
25
cf. <4ef9287b-6260-9538-7c89-cffb611520ee@maurel.de>
26
38
-And there are some that are not recent regressions:
39
-
40
- - "name-rev" frees some strings it still uses prematurely.
41
- cf. <Ylw+M5wwUYKcLM+M@voi.aagh.net>
42
-
27
Copies of the source code to Git live in many repositories, and the
28
following is a list of the ones I push into or their mirrors. Some
29
repositories have only a subset of branches.
@@ -68,9 +52,150 @@ Release tarballs are available at:
52
53
https://www.kernel.org/pub/software/scm/git/
54
55
+--------------------------------------------------
56
+[Graduated to 'master']
57
+
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
61
+
62
+ "git submodule update" without pathspec should silently skip an
63
+ uninitialized submodule, but it started to become noisy by mistake.
64
+
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>
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
72
+
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".
77
+
78
+ This fixes a regression in 2.36 and is slate to go to 2.36.1
79
+ source: <xmqq7d7bsu2n.fsf@gitster.g>
80
+
81
+
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"
85
+
86
+ Regression fix for 2.36 where "git name-rev" started to sometimes
87
+ reference strings after they are freed.
88
+
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>
91
+
92
--------------------------------------------------
93
[New Topics]
94
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'
101
+
102
+ "git show :<path>" learned to work better with the sparse-index
103
+ feature.
104
+
105
+ Will merge to 'next'?
106
+ source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
107
+
108
+
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
113
+
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.
118
+
119
+ source: <20220428105852.94449-1-carenas@gmail.com>
120
+
121
+
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
126
+
127
+ Documentation update.
128
+
129
+ Expecting a reroll.
130
+ cf. <706e34fb-fb0c-e86d-5d0f-0bd052566b3a@gmail.com>
131
+ source: <pull.1226.git.1651086288.gitgitgadget@gmail.com>
132
+
133
+
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
138
+
139
+ New tests for the safe.directory mechanism.
140
+
141
+ Will merge to 'next'.
142
+ source: <20220427170649.4949-1-szeder.dev@gmail.com>
143
+
144
+--------------------------------------------------
145
+[Stalled]
146
+
147
+* ab/commit-plug-leaks (2022-02-16) 2 commits
148
+ - commit: use strbuf_release() instead of UNLEAK()
149
+ - commit: fix "author_ident" leak
150
+
151
+ Leakfixes in the top-level called-once function.
152
+
153
+ Expecting a reroll.
154
+ I think UNLEAK->strbuf_release() is a regression.
155
+ source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
156
+
157
+
158
+* dl/prompt-pick-fix (2022-03-25) 1 commit
159
+ . git-prompt: fix sequencer/todo detection
160
+
161
+ Fix shell prompt script (in contrib/) for those who set
162
+ rebase.abbreviateCommands; we failed to recognize that we were in a
163
+ multi-step cherry-pick session.
164
+
165
+ Is this even needed? How?
166
+ cf. <xmqqwngdzque.fsf@gitster.g>
167
+ source: <20220325145301.3370-1-danny0838@gmail.com>
168
+
169
+
170
+* es/superproject-aware-submodules (2022-03-09) 3 commits
171
+ . rev-parse: short-circuit superproject worktree when config unset
172
+ . introduce submodule.hasSuperproject record
173
+ . t7400-submodule-basic: modernize inspect() helper
174
+
175
+ A configuration variable in a repository tells if it is (or is not)
176
+ a submodule of a superproject.
177
+
178
+ Expecting a reroll.
179
+ cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
180
+ source: <20220310004423.2627181-1-emilyshaffer@google.com>
181
+
182
+
183
+* cw/remote-object-info (2022-03-30) 5 commits
184
+ . fixup! transfer.advertiseObjectInfo: add object-info config
185
+ . fixup! object-info: add option for retrieving object info
186
+ . object-info: add option for retrieving object info
187
+ . transfer.advertiseObjectInfo: add object-info config
188
+ . fetch-pack: refactor packet writing and fetch options
189
+
190
+ Attempt to add a client component to talk with object-info
191
+ endpoint.
192
+
193
+ Expecting a reroll.
194
+ source: <20220328191112.3092139-1-calvinwan@google.com>
195
+
196
+--------------------------------------------------
197
+[Cooking]
198
+
199
* ah/rebase-keep-base-fix (2022-04-21) 1 commit
200
- rebase: use correct base for --keep-base when a branch is given
201
@@ -121,7 +246,8 @@ Release tarballs are available at:
246
source: <cover-0.4-00000000000-20220421T200733Z-avarab@gmail.com>
247
248
124
-* cb/ci-make-p4-optional (2022-04-23) 5 commits
249
+* cb/ci-make-p4-optional (2022-04-25) 6 commits
250
+ - fixup! ci: make failure to find perforce more user friendly
251
- fixup! CI: use https, not http to download binaries from perforce.com
252
- CI: use https, not http to download binaries from perforce.com
253
- ci: reintroduce prevention from perforce being quarantined in macOS
@@ -221,16 +347,6 @@ Release tarballs are available at:
347
source: <YmP4TaYmSEi6GeB4@vmiklos.hu>
348
349
224
-* rs/name-rev-fix-free-after-use (2022-04-23) 1 commit
225
- - Revert "name-rev: release unused name strings"
226
-
227
- Regression fix for 2.36 where "git name-rev" started to sometimes
228
- reference strings after they are freed.
229
-
230
- Will merge to 'next' and then to 'master'.
231
- source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de>
232
-
233
-
350
* ds/do-not-call-bug-on-bad-refs (2022-04-25) 1 commit
351
- clone: die() instead of BUG() on bad refs
352
@@ -240,29 +356,7 @@ Release tarballs are available at:
356
source: <pull.1214.v2.git.1650894450441.gitgitgadget@gmail.com>
357
358
243
-* gc/submodule-update-part2 (2022-04-25) 2 commits
244
- - SQUASH??? tests to protect the fix
245
- - submodule--helper: fix initialization of warn_if_uninitialized
246
-
247
- "git submodule update" without pathspec should silently skip an
248
- uninitialized submodule, but it started to become noisy by mistake.
249
-
250
- Will merge to 'next' and then to 'master'.
251
- source: <pull.1258.v2.git.git.1650890741430.gitgitgadget@gmail.com>
252
-
253
-
254
-* jc/diff-free-must-free-only-per-iteration-resources (2022-04-25) 2 commits
255
- - t4013: diff-tree --stdin with pathspec
256
- - 2.36 gitk/diff-tree --stdin regression fix
257
-
258
- "diff-tree --stdin <pathspec>" lost the pathspec for second and
259
- later commits, which broke "gitk".
260
-
261
- Will merge to 'next' and then to 'master'.
262
- source: <xmqqbkwpvyyc.fsf@gitster.g>
263
-
264
-
265
-* vd/sparse-stash (2022-04-25) 7 commits
359
+* vd/sparse-stash (2022-04-27) 7 commits
360
- unpack-trees: preserve index sparsity
361
- stash: merge applied stash with merge-ort
362
- merge-recursive: add merge function arg to 'merge_recursive_generic'
@@ -272,62 +366,9 @@ Release tarballs are available at:
366
- stash: expand sparse-checkout compatibility testing
367
368
Teach "git stash" to work better with sparse index entries.
275
- source: <pull.1171.git.1650908957.gitgitgadget@gmail.com>
369
277
---------------------------------------------------
278
-[Stalled]
279
-
280
-* ab/commit-plug-leaks (2022-02-16) 2 commits
281
- - commit: use strbuf_release() instead of UNLEAK()
282
- - commit: fix "author_ident" leak
370
+ source: <pull.1171.v2.git.1651083378.gitgitgadget@gmail.com>
371
284
- Leakfixes in the top-level called-once function.
285
-
286
- Expecting a reroll.
287
- I think UNLEAK->strbuf_release() is a regression.
288
- source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
289
-
290
-
291
-* dl/prompt-pick-fix (2022-03-25) 1 commit
292
- . git-prompt: fix sequencer/todo detection
293
-
294
- Fix shell prompt script (in contrib/) for those who set
295
- rebase.abbreviateCommands; we failed to recognize that we were in a
296
- multi-step cherry-pick session.
297
-
298
- Is this even needed? How?
299
- cf. <xmqqwngdzque.fsf@gitster.g>
300
- source: <20220325145301.3370-1-danny0838@gmail.com>
301
-
302
-
303
-* es/superproject-aware-submodules (2022-03-09) 3 commits
304
- . rev-parse: short-circuit superproject worktree when config unset
305
- . introduce submodule.hasSuperproject record
306
- . t7400-submodule-basic: modernize inspect() helper
307
-
308
- A configuration variable in a repository tells if it is (or is not)
309
- a submodule of a superproject.
310
-
311
- Expecting a reroll.
312
- cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
313
- source: <20220310004423.2627181-1-emilyshaffer@google.com>
314
-
315
-
316
-* cw/remote-object-info (2022-03-30) 5 commits
317
- . fixup! transfer.advertiseObjectInfo: add object-info config
318
- . fixup! object-info: add option for retrieving object info
319
- . object-info: add option for retrieving object info
320
- . transfer.advertiseObjectInfo: add object-info config
321
- . fetch-pack: refactor packet writing and fetch options
322
-
323
- Attempt to add a client component to talk with object-info
324
- endpoint.
325
-
326
- Expecting a reroll.
327
- source: <20220328191112.3092139-1-calvinwan@google.com>
328
-
329
---------------------------------------------------
330
-[Cooking]
372
373
* cm/reftable-0-length-memset (2022-04-15) 1 commit
374
- reftable: avoid undefined behaviour breaking t0032