What's cooking (2022/05 #03)
Junio C Hamano committed
May 10, 2022 at 17:44 UTC
26efbe0c5fd42c6e0a2657837154720ae5b57527
1 file changed
+123
-149
whats-cooking.txt
+123
-149
@@ -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, #02; Thu, 5)
4
-X-master-at: f5aaf72f1b5aeb3b77bccabce014ea2590e823e2
5
-X-next-at: b09085170807c0234d945e787c60e6af100d2712
3
+Subject: What's cooking in git.git (May 2022, #03; Tue, 10)
4
+X-master-at: e8005e4871f130c4e402ddca2032c111252f070a
5
+X-next-at: 7c58a9bb42e7a3326f92385eb92bb0e04adc04ba
6
7
-What's cooking in git.git (May 2022, #02; Thu, 5)
7
+What's cooking in git.git (May 2022, #03; Tue, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -13,13 +13,12 @@ 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
-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 I am planning to cut 2.36.1
19
-soonish by merging them down to 'maint'.
16
+The 2.36 release turned out to be a release with unusually high
17
+number of regressions. Git 2.36.1 has been tagged to deliver fixes
18
+to a handful of them.
19
21
-There are a few more whose fixes have not been adequately reviewed
22
-or agreed upon.
20
+There unfortunately are a few more whose fixes have not been
21
+adequately reviewed or agreed upon.
22
23
- hooks no longer is connected directly to the standard output.
24
cf. <CA+dzEBn108QoMA28f0nC8K21XT+Afua0V2Qv8XkR8rAeqUCCZw@mail.gmail.com>
@@ -27,10 +26,10 @@ or agreed upon.
26
- "sudo make install" does not work out-of-the-box.
27
cf. <4ef9287b-6260-9538-7c89-cffb611520ee@maurel.de>
28
30
-These fixed soon, 2.36.2 needs to follow, but one step at a time.
29
+These fixed soon, a new maintenance release needs to follow.
30
32
-We're in week #2 of this cycle (https://tinyurl.com/gitCal), which
33
-is expected to conclude in early July.
31
+This cycle will conclude in early July (https://tinyurl.com/gitCal);
32
+we are in week #3 of the cycle.
33
34
Copies of the source code to Git live in many repositories, and the
35
following is a list of the ones I push into or their mirrors. Some
@@ -61,130 +60,52 @@ Release tarballs are available at:
60
https://www.kernel.org/pub/software/scm/git/
61
62
--------------------------------------------------
64
-[Graduated to 'master']
65
-
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
-
70
- Correct choices of C compilers used in various CI jobs.
71
- source: <patch-v3-1.1-8b3444ecc87-20220422T092015Z-avarab@gmail.com>
72
-
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
-
78
- Code clean-up.
79
- source: <20220415083058.29495-1-carenas@gmail.com>
80
-
81
-
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
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.
102
- source: <xmqqlevl4ysk.fsf@gitster.g>
103
-
63
+[New Topics]
64
105
-* jc/cocci-xstrdup-or-null-fix (2022-04-30) 1 commit
106
- (merged to 'next' on 2022-05-02 at dda0f8bfce)
107
- + cocci: drop bogus xstrdup_or_null() rule
65
+* cd/bisect-messages-from-pre-flight-states (2022-05-06) 2 commits
66
+ - bisect: output bisect setup status in bisect log
67
+ - bisect: output state before we are ready to compute bisection
68
109
- Get rid of a bogus and over-eager coccinelle rule.
110
- source: <xmqq1qxd6e4x.fsf@gitster.g>
69
+ "git bisect" was too silent before it is ready to start computing
70
+ the actual bisection, which has been corrected.
71
72
+ Expecting a (hopefully final) reroll.
73
+ cf. <xmqqh762le32.fsf@gitster.g>
74
+ source: <cover.1651796862.git.chris@chrisdown.name>
75
113
-* jc/show-pathspec-fix (2022-04-29) 1 commit
114
- (merged to 'next' on 2022-05-02 at 7781c7b275)
115
- + 2.36 show regression fix
76
117
- "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
118
- when showing the second and subsequent commits, which has been
119
- corrected.
120
- source: <xmqqo80j87g0.fsf_-_@gitster.g>
77
+* mg/detect-compiler-in-c-locale (2022-05-09) 1 commit
78
+ - detect-compiler: make detection independent of locale
79
80
+ Build procedure fixup.
81
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
82
+ Will merge to 'next'.
83
+ source: <f306f43f375bc9b9c98e85260587442e5d9ef0ba.1652094958.git.git@grubix.eu>
84
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>
85
86
+* gc/pull-recurse-submodules (2022-05-10) 1 commit
87
+ - pull: only pass '--recurse-submodules' to subcommands
88
132
-* rs/format-patch-pathspec-fix (2022-04-30) 1 commit
133
- (merged to 'next' on 2022-05-02 at 1f0a9f982a)
134
- + 2.36 format-patch regression fix
89
+ "git pull" without "--recurse-submodules=<arg>" made
90
+ submodule.recurse take precedence over fetch.recurseSubmodules by
91
+ mistake, which has been corrected.
92
136
- "git format-patch <args> -- <pathspec>" lost the pathspec when
137
- showing the second and subsequent commits, which has been
138
- corrected.
139
- source: <c36896a1-6247-123b-4fa3-b7eb24af1897@web.de>
93
+ Expecting a reroll to retitle it.
94
+ cf. <3234941c-5190-819f-fe3a-f528942c6b44@gmail.com>
95
+ source: <pull.1262.v2.git.git.1652210747614.gitgitgadget@gmail.com>
96
97
--------------------------------------------------
142
-[New Topics]
143
-
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
-
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
-
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>
98
+[Stalled]
99
100
+* js/wait-or-whine-can-fail (2022-04-28) 1 commit
101
+ - run-command: don't spam trace2_child_exit()
102
181
-* tk/p4-metadata-coding-strategies (2022-05-04) 1 commit
182
- - git-p4: improve encoding handling to support inconsistent encodings
103
+ We used to log an error return from wait_or_whine() as process
104
+ termination of the waited child, which was incorrect.
105
184
- source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
106
+ Needs clarifying "in rare cases".
107
+ source: <4616d09ffa632bd2c9e308a713c4bdf2a1328c3c.1651179450.git.steadmon@google.com>
108
186
---------------------------------------------------
187
-[Stalled]
109
110
* ab/commit-plug-leaks (2022-02-16) 2 commits
111
- commit: use strbuf_release() instead of UNLEAK()
@@ -222,7 +143,8 @@ Release tarballs are available at:
143
source: <20220310004423.2627181-1-emilyshaffer@google.com>
144
145
225
-* cw/remote-object-info (2022-05-04) 10 commits
146
+* cw/remote-object-info (2022-05-06) 11 commits
147
+ - SQUASH??? coccicheck
148
- SQUASH??? ensure that coccicheck is happy
149
- SQUASH??? compilation fix
150
- cat-file: add --batch-command remote-object-info command
@@ -242,6 +164,65 @@ Release tarballs are available at:
164
--------------------------------------------------
165
[Cooking]
166
167
+* ac/remote-v-with-object-list-filters (2022-05-09) 1 commit
168
+ - builtin/remote.c: teach `-v` to list filters for promisor remotes
169
+
170
+ "git remote -v" now shows the list-objects-filter used during
171
+ fetching from the remote, if available.
172
+ source: <pull.1227.v4.git.1652095969026.gitgitgadget@gmail.com>
173
+
174
+
175
+* cc/http-curlopt-resolve (2022-05-09) 1 commit
176
+ - http: add custom hostname to IP address resolutions
177
+
178
+ With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
179
+ mechanism that allows cURL based applications to use pre-resolved
180
+ IP addresses for the requests is exposed to the scripts.
181
+
182
+ Will merge to 'next'?
183
+ source: <20220509153834.485871-1-chriscool@tuxfamily.org>
184
+
185
+
186
+* js/trace2-doc-fixes (2022-05-04) 6 commits
187
+ - trace2 docs: add missing full stop
188
+ - trace2 docs: clarify what `varargs` is all about
189
+ - trace2 docs: fix a JSON formatted example
190
+ - trace2 docs: surround more terms in backticks
191
+ - trace2 docs: "printf" is not an English word
192
+ - trace2 docs: a couple of grammar fixes
193
+
194
+ Trace2 documentation updates.
195
+
196
+ Will merge to 'next'.
197
+ source: <pull.1172.v2.git.1651573607.gitgitgadget@gmail.com>
198
+
199
+
200
+* jx/l10n-workflow-change (2022-05-04) 9 commits
201
+ - l10n: Document the new l10n workflow
202
+ - Makefile: add "po-init" rule to initialize po/XX.po
203
+ - Makefile: add "po-update" rule to update po/XX.po
204
+ - po/git.pot: don't check in result of "make pot"
205
+ - po/git.pot: this is now a generated file
206
+ - i18n CI: stop allowing non-ASCII source messages in po/git.pot
207
+ - Makefile: have "make pot" not "reset --hard"
208
+ - Makefile: generate "po/git.pot" from stable LOCALIZED_C
209
+ - Makefile: sort "po/git.pot" by file location
210
+
211
+ A workflow change for translators are being proposed.
212
+
213
+ cf. <YnRI6u+dV5GNHoD9@acer>
214
+ source: <20220503132354.9567-1-worldhello.net@gmail.com>
215
+
216
+
217
+* tk/p4-metadata-coding-strategies (2022-05-04) 1 commit
218
+ - git-p4: improve encoding handling to support inconsistent encodings
219
+
220
+ "git p4" updates.
221
+
222
+ Will merge to 'next'?
223
+ source: <pull.1206.v4.git.1651346812586.gitgitgadget@gmail.com>
224
+
225
+
226
* ep/equals-null-cocci (2022-05-02) 2 commits
227
- tree-wide: apply equals-null.cocci
228
- Merge branch 'ep/maint-equals-null-cocci' into ep/equals-null-cocci
@@ -249,7 +230,7 @@ Release tarballs are available at:
230
231
Merges up ep/maint-equals-null-cocci to the current codebase.
232
252
- Will merge to 'next'?
233
+ Will merge to 'next'.
234
235
236
* ep/maint-equals-null-cocci (2022-05-02) 4 commits
@@ -263,17 +244,7 @@ Release tarballs are available at:
244
comparison between a pointer and NULL, and applies the clean-up to
245
the maintenance track.
246
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>
247
+ Will merge to 'next'.
248
249
250
* ds/sparse-colon-path (2022-04-26) 5 commits
@@ -290,16 +261,18 @@ Release tarballs are available at:
261
source: <pull.1207.v2.git.1651005800.gitgitgadget@gmail.com>
262
263
293
-* cb/path-owner-check-with-sudo (2022-05-02) 3 commits
294
- - t0034: enhance framework to allow testing more commands under sudo
264
+* cb/path-owner-check-with-sudo (2022-05-10) 3 commits
265
+ - t0034: add negative tests and allow git init to mostly work under sudo
266
- git-compat-util: avoid failing dir ownership checks if running privileged
296
- - t: document regression git safe.directory when using sudo
267
+ - t: regression git needs safe.directory when using sudo
268
269
With a recent update to refuse access to repositories of other
270
people by default, "sudo make install" and "sudo git describe"
271
stopped working. This series intends to loosen it while keeping
272
the safety.
302
- source: <20220502183920.88982-1-carenas@gmail.com>
273
+
274
+ Will merge to 'next'?
275
+ source: <20220510174616.18629-1-carenas@gmail.com>
276
277
278
* pb/ggg-in-mfc-doc (2022-04-27) 3 commits
@@ -465,17 +438,18 @@ Release tarballs are available at:
438
source: <pull.1214.v2.git.1650894450441.gitgitgadget@gmail.com>
439
440
468
-* vd/sparse-stash (2022-04-27) 7 commits
441
+* vd/sparse-stash (2022-05-10) 6 commits
442
- unpack-trees: preserve index sparsity
470
- - stash: merge applied stash with merge-ort
471
- - merge-recursive: add merge function arg to 'merge_recursive_generic'
443
+ - stash: apply stash using 'merge_ort_nonrecursive()'
444
- read-cache: set sparsity when index is new
445
- sparse-index: expose 'is_sparse_index_allowed()'
446
- stash: integrate with sparse index
447
- stash: expand sparse-checkout compatibility testing
448
449
Teach "git stash" to work better with sparse index entries.
478
- source: <pull.1171.v2.git.1651083378.gitgitgadget@gmail.com>
450
+
451
+ Will merge to 'next'?
452
+ source: <pull.1171.v3.git.1652225552.gitgitgadget@gmail.com>
453
454
455
* sa/t1011-use-helpers (2022-04-12) 1 commit
@@ -610,7 +584,7 @@ Release tarballs are available at:
584
585
Code clean-up.
586
613
- Will cook in 'next'.
587
+ Will merge to 'master'.
588
source: <cover-v4-0.6-00000000000-20220331T014349Z-avarab@gmail.com>
589
590
@@ -631,7 +605,7 @@ Release tarballs are available at:
605
The progress meter of "git blame" was showing incorrect numbers
606
when processing only parts of the file.
607
634
- Will cook in 'next'.
608
+ Will merge to 'master'.
609
source: <20220406181320.16911-1-eantoranz@gmail.com>
610
611
@@ -747,7 +721,7 @@ Release tarballs are available at:
721
Reimplement "vimdiff[123]" mergetool drivers with a more generic
722
layout mechanism.
723
750
- Will cook in 'next'.
724
+ Will merge to 'master'.
725
source: <20220330191909.294610-1-greenfoo@u92.eu>
726
727
@@ -885,7 +859,7 @@ Release tarballs are available at:
859
when "--untracked-files=<mode>" and "status.showUntrackedFiles"
860
are combined.
861
888
- Will cook in 'next'.
862
+ Will merge to 'master'.
863
source: <pull.985.v6.git.1648742535.gitgitgadget@gmail.com>
864
865
@@ -947,17 +921,17 @@ Release tarballs are available at:
921
source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
922
923
950
-* js/scalar-diagnose (2022-05-04) 7 commits
924
+* js/scalar-diagnose (2022-05-10) 7 commits
925
- scalar: teach `diagnose` to gather loose objects information
926
- scalar: teach `diagnose` to gather packfile info
927
- scalar diagnose: include disk space information
954
- - Implement `scalar diagnose`
928
+ - scalar: implement `scalar diagnose`
929
- scalar: validate the optional enlistment argument
930
- archive --add-file-with-contents: allow paths containing colons
931
- archive: optionally add "virtual" files
932
933
Implementation of "scalar diagnose" subcommand.
960
- source: <pull.1128.v3.git.1651677919.gitgitgadget@gmail.com>
934
+ source: <pull.1128.v4.git.1652210824.gitgitgadget@gmail.com>
935
936
937
* en/merge-tree (2022-02-23) 13 commits
@@ -1012,7 +986,7 @@ Release tarballs are available at:
986
987
Various cleanups to "git p4".
988
1015
- Will cook in 'next'.
989
+ Will merge to 'master'.
990
source: <20220401142504.58995-1-jholdsworth@nvidia.com>
991
992