What's cooking (2022/05 #02)
Junio C Hamano committed
May 5, 2022 at 12:20 UTC
0699cc56c369f467d2afacc593a3b402f2c9b7ce
1 file changed
+167
-117
whats-cooking.txt
+167
-117
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2022, #01; Mon, 2)
4
-X-master-at: 0f828332d5ac36fc63b7d8202652efa152809856
5
-X-next-at: e40c2bad7a72449dac987539a750bfb48c4d77c8
3
+Subject: What's cooking in git.git (May 2022, #02; Thu, 5)
4
+X-master-at: f5aaf72f1b5aeb3b77bccabce014ea2590e823e2
5
+X-next-at: b09085170807c0234d945e787c60e6af100d2712
6
7
-What's cooking in git.git (May 2022, #01; Mon, 2)
7
+What's cooking in git.git (May 2022, #02; Thu, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -15,9 +15,11 @@ 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, 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.
18
+them on the 'master' front already, and I am planning to cut 2.36.1
19
+soonish by merging them down to 'maint'.
20
+
21
+There are a few more whose fixes have not been adequately reviewed
22
+or agreed upon.
23
24
- hooks no longer is connected directly to the standard output.
25
cf. <CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com>
@@ -25,6 +27,11 @@ more whose fixes have not been adequately reviewed or agreed upon.
27
- "sudo make install" does not work out-of-the-box.
28
cf. <4ef9287b-6260-9538-7c89-cffb611520ee@maurel.de>
29
30
+These fixed soon, 2.36.2 needs to follow, but one step at a time.
31
+
32
+We're in week #2 of this cycle (https://tinyurl.com/gitCal), which
33
+is expected to conclude in early July.
34
+
35
Copies of the source code to Git live in many repositories, and the
36
following is a list of the ones I push into or their mirrors. Some
37
repositories have only a subset of branches.
@@ -54,93 +61,127 @@ Release tarballs are available at:
61
https://www.kernel.org/pub/software/scm/git/
62
63
--------------------------------------------------
57
-[New Topics]
64
+[Graduated to 'master']
65
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.)
66
+* ab/cc-package-fixes (2022-04-22) 1 commit
67
+ (merged to 'next' on 2022-05-02 at 59e6137286)
68
+ + CI: select CC based on CC_PACKAGE (again)
69
64
- Merges up ep/maint-equals-null-cocci to the current codebase.
70
+ Correct choices of C compilers used in various CI jobs.
71
+ source: <patch-v3-1.1-8b3444ecc87-20220422T092015Z-avarab@gmail.com>
72
66
- Will merge to 'next'?
73
74
+* cm/reftable-0-length-memset (2022-04-15) 1 commit
75
+ (merged to 'next' on 2022-05-02 at 781715e2b7)
76
+ + reftable: avoid undefined behaviour breaking t0032
77
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.)
78
+ Code clean-up.
79
+ source: <20220415083058.29495-1-carenas@gmail.com>
80
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.
81
80
- Will merge to 'next'?
82
+* ds/midx-normalize-pathname-before-comparison (2022-04-25) 3 commits
83
+ (merged to 'next' on 2022-05-02 at aba30d3c42)
84
+ + cache: use const char * for get_object_directory()
85
+ + multi-pack-index: use --object-dir real path
86
+ + midx: use real paths in lookup_multi_pack_index()
87
+
88
+ The path taken by "git multi-pack-index" command from the end user
89
+ was compared with path internally prepared by the tool withut first
90
+ normalizing, which lead to duplicated paths not being noticed,
91
+ which has been corrected.
92
+ source: <pull.1221.v2.git.1650911234.gitgitgadget@gmail.com>
93
94
95
* jc/clone-remote-name-leak-fix (2022-04-30) 1 commit
84
- - clone: plug a miniscule leak
96
+ (merged to 'next' on 2022-05-02 at 32a51558ea)
97
+ + clone: plug a miniscule leak
98
99
"git clone --origin X" leaked piece of memory that held value read
100
from the clone.defaultRemoteName configuration variable, which has
101
been plugged.
89
-
90
- Will merge to 'next'.
102
source: <xmqqlevl4ysk.fsf@gitster.g>
103
104
105
* jc/cocci-xstrdup-or-null-fix (2022-04-30) 1 commit
95
- - cocci: drop bogus xstrdup_or_null() rule
106
+ (merged to 'next' on 2022-05-02 at dda0f8bfce)
107
+ + cocci: drop bogus xstrdup_or_null() rule
108
109
Get rid of a bogus and over-eager coccinelle rule.
98
-
99
- Will merge to 'next'.
110
source: <xmqq1qxd6e4x.fsf@gitster.g>
111
112
103
-* js/wait-or-whine-can-fail (2022-04-28) 1 commit
104
- - run-command: don't spam trace2_child_exit()
105
-
106
- We used to log an error return from wait_or_whine() as process
107
- termination of the waited child, which was incorrect.
108
-
109
- Needs clarifying "in rare cases".
110
- source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
111
-
112
-
113
* jc/show-pathspec-fix (2022-04-29) 1 commit
114
- - 2.36 show regression fix
114
+ (merged to 'next' on 2022-05-02 at 7781c7b275)
115
+ + 2.36 show regression fix
116
117
"git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
118
when showing the second and subsequent commits, which has been
119
corrected.
119
-
120
- Will merge to 'next' and then to 'master'.
120
source: <xmqqo80j87g0.fsf_-_@gitster.g>
121
122
123
+* rs/fast-export-pathspec-fix (2022-04-30) 1 commit
124
+ (merged to 'next' on 2022-05-02 at 0fb97cb01d)
125
+ + 2.36 fast-export regression fix
126
+
127
+ "git fast-export -- <pathspec>" lost the pathspec when showing the
128
+ second and subsequent commits, which has been corrected.
129
+ source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de>
130
+
131
+
132
* rs/format-patch-pathspec-fix (2022-04-30) 1 commit
125
- - 2.36 format-patch regression fix
133
+ (merged to 'next' on 2022-05-02 at 1f0a9f982a)
134
+ + 2.36 format-patch regression fix
135
136
"git format-patch <args> -- <pathspec>" lost the pathspec when
137
showing the second and subsequent commits, which has been
138
corrected.
130
-
131
- Will merge to 'next' and then to 'master'.
139
source: <c36896a1-6247-123b-4fa3-b7eb24af1897@web.de>
140
141
+--------------------------------------------------
142
+[New Topics]
143
135
-* rs/fast-export-pathspec-fix (2022-04-30) 1 commit
136
- - 2.36 fast-export regression fix
144
+* ac/remote-v-with-object-list-filters (2022-05-04) 1 commit
145
+ - builtin/remote.c: teach `-v` to list filters for promisor remotes
146
138
- "git fast-export -- <pathspec>" lost the pathspec when showing the
139
- second and subsequent commits, which has been corrected.
147
+ source: <pull.1227.v2.git.1651591253333.gitgitgadget@gmail.com>
148
+
149
+
150
+* cc/http-curlopt-resolve (2022-05-04) 1 commit
151
+ - http: add custom hostname to IP address resolutions
152
+
153
+ source: <20220504104601.136403-1-chriscool@tuxfamily.org>
154
141
- Will merge to 'next' and then to 'master'.
142
- source: <2c988c7b-0efe-4222-4a43-8124fe1a9da6@web.de>
155
156
+* js/trace2-doc-fixes (2022-05-04) 6 commits
157
+ - trace2 docs: add missing full stop
158
+ - trace2 docs: clarify what `varargs` is all about
159
+ - trace2 docs: fix a JSON formatted example
160
+ - trace2 docs: surround more terms in backticks
161
+ - trace2 docs: "printf" is not an English word
162
+ - trace2 docs: a couple of grammar fixes
163
+
164
+ source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
165
+
166
+
167
+* jx/l10n-workflow-change (2022-05-04) 9 commits
168
+ - l10n: Document the new l10n workflow
169
+ - Makefile: add "po-init" rule to initialize po/XX.po
170
+ - Makefile: add "po-update" rule to update po/XX.po
171
+ - po/git.pot: don't check in result of "make pot"
172
+ - po/git.pot: this is now a generated file
173
+ - i18n CI: stop allowing non-ASCII source messages in po/git.pot
174
+ - Makefile: have "make pot" not "reset --hard"
175
+ - Makefile: generate "po/git.pot" from stable LOCALIZED_C
176
+ - Makefile: sort "po/git.pot" by file location
177
+
178
+ source: <20220503132354.9567-1-worldhello.net@gmail.com>
179
+
180
+
181
+* tk/p4-metadata-coding-strategies (2022-05-04) 1 commit
182
+ - git-p4: improve encoding handling to support inconsistent encodings
183
+
184
+ source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
185
186
--------------------------------------------------
187
[Stalled]
@@ -181,22 +222,60 @@ Release tarballs are available at:
222
source: <20220310004423.2627181-1-emilyshaffer@google.com>
223
224
184
-* cw/remote-object-info (2022-03-30) 5 commits
185
- . fixup! transfer.advertiseObjectInfo: add object-info config
186
- . fixup! object-info: add option for retrieving object info
187
- . object-info: add option for retrieving object info
188
- . transfer.advertiseObjectInfo: add object-info config
189
- . fetch-pack: refactor packet writing and fetch options
225
+* cw/remote-object-info (2022-05-04) 10 commits
226
+ - SQUASH??? ensure that coccicheck is happy
227
+ - SQUASH??? compilation fix
228
+ - cat-file: add --batch-command remote-object-info command
229
+ - cat-file: move parse_cmd and DEFAULT_FORMAT up
230
+ - transport: add object-info fallback to fetch
231
+ - transport: add client side capability to request object-info
232
+ - object-info: send attribute packet regardless of object ids
233
+ - object-store: add function to free object_info contents
234
+ - fetch-pack: move fetch default settings
235
+ - fetch-pack: refactor packet writing
236
191
- Attempt to add a client component to talk with object-info
192
- endpoint.
237
+ A client component to talk with the object-info endpoint.
238
239
Expecting a reroll.
195
- source: <20220328191112.3092139-1-calvinwan@google.com>
240
+ source: <20220502170904.2770649-1-calvinwan@google.com>
241
242
--------------------------------------------------
243
[Cooking]
244
245
+* ep/equals-null-cocci (2022-05-02) 2 commits
246
+ - tree-wide: apply equals-null.cocci
247
+ - Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
248
+ (this branch uses ep/maint-equals-null-cocci.)
249
+
250
+ Merges up ep/maint-equals-null-cocci to the current codebase.
251
+
252
+ Will merge to 'next'?
253
+
254
+
255
+* ep/maint-equals-null-cocci (2022-05-02) 4 commits
256
+ - tree-wide: apply equals-null.cocci
257
+ - Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
258
+ - tree-wide: apply equals-null.cocci
259
+ - contrib/coccinnelle: add equals-null.cocci
260
+ (this branch is used by ep/equals-null-cocci.)
261
+
262
+ Introduce and apply coccinelle rule to discourage an explicit
263
+ comparison between a pointer and NULL, and applies the clean-up to
264
+ the maintenance track.
265
+
266
+ Will merge to 'next'?
267
+
268
+
269
+* js/wait-or-whine-can-fail (2022-04-28) 1 commit
270
+ - run-command: don't spam trace2_child_exit()
271
+
272
+ We used to log an error return from wait_or_whine() as process
273
+ termination of the waited child, which was incorrect.
274
+
275
+ Needs clarifying "in rare cases".
276
+ source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
277
+
278
+
279
* ds/sparse-colon-path (2022-04-26) 5 commits
280
- rev-parse: integrate with sparse index
281
- object-name: diagnose trees in index properly
@@ -207,20 +286,20 @@ Release tarballs are available at:
286
"git show :<path>" learned to work better with the sparse-index
287
feature.
288
210
- Will merge to 'next'?
289
+ Will merge to 'next'.
290
source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
291
292
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
293
+* cb/path-owner-check-with-sudo (2022-05-02) 3 commits
294
+ - t0034: enhance framework to allow testing more commands under sudo
295
- git-compat-util: avoid failing dir ownership checks if running privileged
296
+ - t: document regression git safe.directory when using sudo
297
298
With a recent update to refuse access to repositories of other
299
people by default, "sudo make install" and "sudo git describe"
300
stopped working. This series intends to loosen it while keeping
301
the safety.
223
- source: <20220428105852.94449-1-carenas@gmail.com>
302
+ source: <20220502183920.88982-1-carenas@gmail.com>
303
304
305
* pb/ggg-in-mfc-doc (2022-04-27) 3 commits
@@ -247,12 +326,13 @@ Release tarballs are available at:
326
327
328
* ah/rebase-keep-base-fix (2022-04-21) 1 commit
250
- - rebase: use correct base for --keep-base when a branch is given
329
+ (merged to 'next' on 2022-05-02 at 8e6071e208)
330
+ + rebase: use correct base for --keep-base when a branch is given
331
332
"git rebase --keep-base <upstream> <branch-to-rebase>" computed the
333
commit to rebase onto incorrectly, which has been corrected.
334
255
- Will merge to 'next'.
335
+ Will merge to 'master'.
336
source: <20220421044233.894255-1-alexhenrie24@gmail.com>
337
338
@@ -266,20 +346,22 @@ Release tarballs are available at:
346
347
348
* ea/rebase-code-simplify (2022-04-20) 1 commit
269
- - rebase: simplify an assignment of options.type in cmd_rebase
349
+ (merged to 'next' on 2022-05-02 at 88ed49c2d0)
350
+ + rebase: simplify an assignment of options.type in cmd_rebase
351
352
Code clean-up.
353
273
- Will merge to 'next'.
354
+ Will merge to 'master'.
355
source: <20220418172721.215898-1-eantoranz@gmail.com>
356
357
358
* kt/commit-graph-plug-fp-leak-on-error (2022-04-20) 1 commit
278
- - commit-graph: close file before returning NULL
359
+ (merged to 'next' on 2022-05-02 at c3bcb92518)
360
+ + commit-graph: close file before returning NULL
361
362
Fix a leak of FILE * in an error codepath.
363
282
- Will merge to 'next'.
364
+ Will merge to 'master'.
365
source: <pull.1213.git.1650302007395.gitgitgadget@gmail.com>
366
367
@@ -314,20 +396,6 @@ Release tarballs are available at:
396
source: <0220423142559.32507-5-carenas@gmail.com>
397
398
317
-* ds/midx-normalize-pathname-before-comparison (2022-04-25) 3 commits
318
- - cache: use const char * for get_object_directory()
319
- - multi-pack-index: use --object-dir real path
320
- - midx: use real paths in lookup_multi_pack_index()
321
-
322
- The path taken by "git multi-pack-index" command from the end user
323
- was compared with path internally prepared by the tool withut first
324
- normalizing, which lead to duplicated paths not being noticed,
325
- which has been corrected.
326
-
327
- Will merge to 'next'.
328
- source: <pull.1221.v2.git.1650911234.gitgitgadget@gmail.com>
329
-
330
-
399
* jc/show-branch-g-current (2022-04-21) 1 commit
400
- show-branch: -g and --current are incompatible
401
@@ -348,15 +416,6 @@ Release tarballs are available at:
416
source: <2ad1dd80-e79f-7304-219c-db24bb269c4d@web.de>
417
418
351
-* ab/cc-package-fixes (2022-04-22) 1 commit
352
- - CI: select CC based on CC_PACKAGE (again)
353
-
354
- Correct choices of C compilers used in various CI jobs.
355
-
356
- Will merge to 'next'.
357
- source: <patch-v3-1.1-8b3444ecc87-20220422T092015Z-avarab@gmail.com>
358
-
359
-
419
* ab/hooks-regression-fix (2022-04-21) 6 commits
420
- hook API: fix v2.36.0 regression: hooks should be connected to a TTY
421
- hook API: don't redundantly re-set "no_stdin" and "stdout_to_stderr"
@@ -419,15 +478,6 @@ Release tarballs are available at:
478
source: <pull.1171.v2.git.1651083378.gitgitgadget@gmail.com>
479
480
422
-* cm/reftable-0-length-memset (2022-04-15) 1 commit
423
- - reftable: avoid undefined behaviour breaking t0032
424
-
425
- Code clean-up.
426
-
427
- Will merge to 'next'.
428
- source: <20220415083058.29495-1-carenas@gmail.com>
429
-
430
-
481
* sa/t1011-use-helpers (2022-04-12) 1 commit
482
- t1011: replace test -f with test_path_is_file
483
@@ -444,12 +494,13 @@ Release tarballs are available at:
494
495
496
* pw/test-malloc-with-sanitize-address (2022-04-11) 1 commit
447
- - tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
497
+ (merged to 'next' on 2022-05-02 at a25766055f)
498
+ + tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
499
500
Avoid problems from interaction between malloc_check and address
501
sanitizer.
502
452
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com>
505
506
@@ -509,12 +560,13 @@ Release tarballs are available at:
560
561
562
* rs/commit-summary-wo-break-rewrite (2022-04-06) 1 commit
512
- - commit, sequencer: turn off break_opt for commit summary
563
+ (merged to 'next' on 2022-05-02 at c40509b820)
564
+ + commit, sequencer: turn off break_opt for commit summary
565
566
The commit summary shown after making a commit is matched to what
567
is given in "git status" not to use the break-rewrite heuristics.
568
517
- Will merge to 'next'.
569
+ Will merge to 'master'.
570
source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de>
571
572
@@ -708,7 +760,8 @@ Release tarballs are available at:
760
A mechanism to export and import stash entries to and from a normal
761
commit to transfer it across repositories has been introduced.
762
711
- Will merge to 'next'?
763
+ Expecting a reroll.
764
+ cf. <YnL2d4Vr9Vr7W4Hj@camp.crustytoothpaste.net>
765
source: <20220407215352.3491567-1-sandals@crustytoothpaste.net>
766
767
@@ -748,7 +801,7 @@ Release tarballs are available at:
801
802
Deprecate non-cone mode of the sparse-checkout feature.
803
751
- Will merge to 'next'?
804
+ Will merge to 'next'.
805
source: <pull.1148.v3.git.1650594746.gitgitgadget@gmail.com>
806
807
@@ -820,7 +873,6 @@ Release tarballs are available at:
873
-c push.default=simple" on branch $A would push to update the
874
branch $A at the remote $B came from. Also more places use the
875
sole remote, if exists, before defaulting to 'origin'.
823
-
876
source: <pull.1161.v5.git.1651226206.gitgitgadget@gmail.com>
877
878
@@ -895,19 +947,17 @@ Release tarballs are available at:
947
source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
948
949
898
-* js/scalar-diagnose (2022-02-06) 6 commits
950
+* js/scalar-diagnose (2022-05-04) 7 commits
951
- scalar: teach `diagnose` to gather loose objects information
952
- scalar: teach `diagnose` to gather packfile info
953
- scalar diagnose: include disk space information
902
- - scalar: add `diagnose`
954
+ - Implement `scalar diagnose`
955
- scalar: validate the optional enlistment argument
956
+ - archive --add-file-with-contents: allow paths containing colons
957
- archive: optionally add "virtual" files
958
959
Implementation of "scalar diagnose" subcommand.
907
-
908
- On hold.
909
- cf. <nycvar.QRO.7.76.6.2203012353090.11118@tvgsbejvaqbjf.bet>
910
- source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
960
+ source: <pull.1128.v3.git.1651677919.gitgitgadget@gmail.com>
961
962
963
* en/merge-tree (2022-02-23) 13 commits