What's cooking (2024/05 #06)
Junio C Hamano committed
May 14, 2024 at 07:50 UTC
6388294d9d48f83453d8aaed5f8f9e8dbb315761
1 file changed
+173
-141
whats-cooking.txt
+173
-141
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2024, #05; Sat, 11)
3
-X-master-at: 0f3415f1f8478b05e64db11eb8aaa2915e48fef6
4
-X-next-at: 78c648537befcff421d4ad73d5ad976eb9255800
2
+Subject: What's cooking in git.git (May 2024, #06; Tue, 14)
3
+X-master-at: 83f1add914c6b4682de1e944ec0d1ac043d53d78
4
+X-next-at: 74e4eb009334be9d0c81507039d39db2634c3a6b
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2024, #05; Sat, 11)
7
+What's cooking in git.git (May 2024, #06; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,9 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
+Git 2.45.1 and friends have been released, and the integration
21
+branches for developers have all been updated to include them.
22
+
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
25
repositories have only a subset of branches.
@@ -45,11 +48,158 @@ Release tarballs are available at:
48
49
https://www.kernel.org/pub/software/scm/git/
50
51
+--------------------------------------------------
52
+[Graduated to 'master']
53
+
54
+* fa/p4-error (2024-05-08) 1 commit
55
+ (merged to 'next' on 2024-05-11 at 58fd3fbf2f)
56
+ + git-p4: show Perforce error to the user
57
+
58
+ P4 update.
59
+ source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com>
60
+
61
+
62
+* jc/git-gui-maintainer-update (2024-05-11) 1 commit
63
+ (merged to 'next' on 2024-05-11 at 78c648537b)
64
+ + SubmittingPatches: welcome the new maintainer of git-gui part
65
+
66
+ Will merge to 'master'.
67
+
68
+
69
+* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit
70
+ (merged to 'next' on 2024-05-08 at a34819b16d)
71
+ + stop using HEAD for attributes in bare repository by default
72
+ (this branch is used by ps/undecided-is-not-necessarily-sha1.)
73
+
74
+ Git 2.43 started using the tree of HEAD as the source of attributes
75
+ in a bare repository, which has severe performance implications.
76
+ For now, revert the change, without ripping out a more explicit
77
+ support for the attr.tree configuration variable.
78
+ source: <xmqqzft6aozg.fsf_-_@gitster.g>
79
+
80
+
81
+* jc/test-workaround-broken-mv (2024-05-02) 1 commit
82
+ (merged to 'next' on 2024-05-06 at 7e009c6827)
83
+ + t/lib-chunk: work around broken "mv" on some vintage of macOS
84
+
85
+ Tests that try to corrupt in-repository files in chunked format did
86
+ not work well on macOS due to its broken "mv", which has been
87
+ worked around.
88
+ source: <xmqqsez0c6ma.fsf@gitster.g>
89
+
90
+
91
+* jk/ci-macos-gcc13-fix (2024-05-09) 3 commits
92
+ (merged to 'next' on 2024-05-11 at 571a90f095)
93
+ + ci: stop installing "gcc-13" for osx-gcc
94
+ + ci: avoid bare "gcc" for osx-gcc job
95
+ + ci: drop mention of BREW_INSTALL_PACKAGES variable
96
+
97
+ CI fix.
98
+ source: <20240509162219.GA1707955@coredump.intra.peff.net>
99
+
100
+
101
+* jk/ci-test-with-jgit-fix (2024-05-09) 1 commit
102
+ (merged to 'next' on 2024-05-11 at 7d3d69657e)
103
+ + ci: update coverity runs_on_pool reference
104
+
105
+ CI fix.
106
+ source: <20240509161506.GA1707588@coredump.intra.peff.net>
107
+
108
+
109
+* ma/win32-unix-domain-socket (2024-05-03) 1 commit
110
+ (merged to 'next' on 2024-05-06 at 799a546c96)
111
+ + win32: fix building with NO_UNIX_SOCKETS
112
+
113
+ Build fix.
114
+ source: <20240503091427.2808390-1-mh@glandium.org>
115
+
116
+
117
+* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit
118
+ (merged to 'next' on 2024-05-07 at a76024bd9f)
119
+ + gitlab-ci: add smoke test for fuzzers
120
+ (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
121
+
122
+ CI update.
123
+ source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
124
+
125
+
126
+* ps/ci-fuzzers-at-gitlab-fix (2024-05-09) 3 commits
127
+ (merged to 'next' on 2024-05-11 at f4307d4164)
128
+ + gitlab-ci: fix installing dependencies for fuzz smoke tests
129
+ + Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix
130
+ + Merge branch 'ps/ci-enable-minimal-fuzzers-at-gitlab' into ps/ci-fuzzers-at-gitlab-fix
131
+ (this branch uses ps/ci-enable-minimal-fuzzers-at-gitlab and ps/ci-python-2-deprecation.)
132
+
133
+ CI fix.
134
+ source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im>
135
+
136
+
137
+* ps/ci-python-2-deprecation (2024-05-06) 1 commit
138
+ (merged to 'next' on 2024-05-07 at 0e11e94f99)
139
+ + ci: fix Python dependency on Ubuntu 24.04
140
+ (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
141
+
142
+ Unbreak CI jobs so that we do not attempt to use Python 2 that has
143
+ been removed from the platform.
144
+ source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im>
145
+
146
+
147
+* tb/attr-limits (2024-05-03) 1 commit
148
+ (merged to 'next' on 2024-05-06 at b98150cc71)
149
+ + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
150
+
151
+ The maximum size of attribute files is enforced more consistently.
152
+ source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>
153
+
154
--------------------------------------------------
155
[New Topics]
156
51
-* ps/builtin-config-cleanup (2024-05-10) 23 commits
52
- - fixup! builtin/config: move location options into local variables
157
+* jc/compat-regex-calloc-fix (2024-05-13) 1 commit
158
+ (merged to 'next' on 2024-05-13 at 077c4e1dcc)
159
+ + compat/regex: fix argument order to calloc(3)
160
+
161
+ Windows CI running in GitHub Actions started complaining about the
162
+ order of arguments given to calloc(); the imported regex code uses
163
+ the wrong order almost consistently, which has been corrected.
164
+
165
+ Will merge to 'master'.
166
+ source: <xmqqbk5bim2n.fsf@gitster.g>
167
+
168
+
169
+* jc/undecided-is-not-necessarily-sha1-fix (2024-05-13) 6 commits
170
+ - apply: fix uninitialized hash function
171
+ - builtin/hash-object: fix uninitialized hash function
172
+ - builtin/patch-id: fix uninitialized hash function
173
+ - t1517: test commands that are designed to be run outside repository
174
+ - setup: add an escape hatch for "no more default hash algorithm" change
175
+ - Merge branch 'ps/undecided-is-not-necessarily-sha1' into jc/undecided-is-not-necessarily-sha1-fix
176
+ (this branch uses ps/undecided-is-not-necessarily-sha1.)
177
+
178
+ The base topic started to make it an error for a command to leave
179
+ the hash algorithm unspecified, which revealed a few commands that
180
+ were not ready for the change. Give users a knob to revert back to
181
+ the "default is sha-1" behaviour as an escape hatch, and start
182
+ fixing these breakages.
183
+
184
+ Comments?
185
+ source: <20240513224127.2042052-1-gitster@pobox.com>
186
+
187
+
188
+* dg/fetch-pack-code-cleanup (2024-05-13) 1 commit
189
+ - fetch-pack: remove unused 'struct loose_object_iter'
190
+
191
+ source: <20240512005913.342287-1-dave@treblig.org>
192
+
193
+
194
+* dm/update-index-doc-fix (2024-05-13) 1 commit
195
+ - documentation: git-update-index: add --show-index-version to synopsis
196
+
197
+ source: <20240512031400.28416-1-dov.murik@linux.dev>
198
+
199
+--------------------------------------------------
200
+[Cooking]
201
+
202
+* ps/builtin-config-cleanup (2024-05-13) 22 commits
203
- builtin/config: pass data between callbacks via local variables
204
- builtin/config: convert flags to a local variable
205
- builtin/config: track "fixed value" option via flags only
@@ -77,18 +227,9 @@ Release tarballs are available at:
227
Code clean-up to reduce inter-function communication inside
228
builtin/config.c done via the use of global variables.
229
80
- Will merge to 'next'?
81
- source: <cover.1715339393.git.ps@pks.im>
82
-
83
-
84
-* jc/git-gui-maintainer-update (2024-05-11) 1 commit
85
- (merged to 'next' on 2024-05-11 at 78c648537b)
86
- + SubmittingPatches: welcome the new maintainer of git-gui part
87
-
88
- Will merge to 'master'.
230
+ Comments?
231
+ source: <cover.1715595550.git.ps@pks.im>
232
90
---------------------------------------------------
91
-[Cooking]
233
234
* vd/doc-merge-tree-x-option (2024-05-07) 1 commit
235
(merged to 'next' on 2024-05-08 at 42637b8bdf)
@@ -100,16 +241,6 @@ Release tarballs are available at:
241
source: <pull.1728.git.1715117789985.gitgitgadget@gmail.com>
242
243
103
-* fa/p4-error (2024-05-08) 1 commit
104
- (merged to 'next' on 2024-05-11 at 58fd3fbf2f)
105
- + git-p4: show Perforce error to the user
106
-
107
- P4 update.
108
-
109
- Will merge to 'master'.
110
- source: <pull.1668.v3.git.git.1715206266214.gitgitgadget@gmail.com>
111
-
112
-
244
* jc/doc-manpages-l10n (2024-05-09) 1 commit
245
- SubmittingPatches: advertise git-manpages-l10n project a bit
246
@@ -120,32 +251,7 @@ Release tarballs are available at:
251
source: <xmqqv83muc12.fsf@gitster.g>
252
253
123
-* jk/ci-macos-gcc13-fix (2024-05-09) 3 commits
124
- (merged to 'next' on 2024-05-11 at 571a90f095)
125
- + ci: stop installing "gcc-13" for osx-gcc
126
- + ci: avoid bare "gcc" for osx-gcc job
127
- + ci: drop mention of BREW_INSTALL_PACKAGES variable
128
-
129
- CI fix.
130
-
131
- Will merge to 'master'.
132
- source: <20240509162219.GA1707955@coredump.intra.peff.net>
133
-
134
-
135
-* ps/ci-fuzzers-at-gitlab-fix (2024-05-09) 3 commits
136
- (merged to 'next' on 2024-05-11 at f4307d4164)
137
- + gitlab-ci: fix installing dependencies for fuzz smoke tests
138
- + Merge branch 'ps/ci-python-2-deprecation' into ps/ci-fuzzers-at-gitlab-fix
139
- + Merge branch 'ps/ci-enable-minimal-fuzzers-at-gitlab' into ps/ci-fuzzers-at-gitlab-fix
140
- (this branch uses ps/ci-enable-minimal-fuzzers-at-gitlab and ps/ci-python-2-deprecation.)
141
-
142
- CI fix.
143
-
144
- Will merge to 'master'.
145
- source: <5a92a4aa9edd9653df71b284f07461c7906f97e2.1715241343.git.ps@pks.im>
146
-
147
-
148
-* ps/reftable-reusable-iterator (2024-05-08) 13 commits
254
+* ps/reftable-reusable-iterator (2024-05-13) 13 commits
255
- reftable/merged: adapt interface to allow reuse of iterators
256
- reftable/stack: provide convenience functions to create iterators
257
- reftable/reader: adapt interface to allow reuse of iterators
@@ -161,7 +267,9 @@ Release tarballs are available at:
267
- reftable/block: use `size_t` to track restart point index
268
269
Code clean-up to make the reftable iterator closer to be reusable.
164
- source: <cover.1715166175.git.ps@pks.im>
270
+
271
+ Comments?
272
+ source: <cover.1715589670.git.ps@pks.im>
273
274
275
* tb/precompose-getcwd (2024-05-09) 1 commit
@@ -175,16 +283,6 @@ Release tarballs are available at:
283
source: <20240509161110.12121-1-tboegi@web.de>
284
285
178
-* jk/ci-test-with-jgit-fix (2024-05-09) 1 commit
179
- (merged to 'next' on 2024-05-11 at 7d3d69657e)
180
- + ci: update coverity runs_on_pool reference
181
-
182
- CI fix.
183
-
184
- Will merge to 'master'.
185
- source: <20240509161506.GA1707588@coredump.intra.peff.net>
186
-
187
-
286
* jc/patch-flow-updates (2024-05-10) 2 commits
287
- SubmittingPatches: extend the "flow" section
288
- SubmittingPatches: move the patch-flow section earlier
@@ -198,8 +296,11 @@ Release tarballs are available at:
296
* it/refs-name-conflict (2024-05-06) 1 commit
297
- refs: return conflict error when checking packed refs
298
201
- Comments?
202
- cf. <CAOLa=ZSre3f+0SR-_migfkPONqhinobKjU=NnGOJ_sTNM_L5ug@mail.gmail.com>
299
+ Expose "name conflict" error when a ref creation fails due to D/F
300
+ conflict in the ref namespace, to improve an error message given by
301
+ "git fetch".
302
+
303
+ Will merge to 'next'.
304
source: <pull.1716.v3.git.git.1714791848557.gitgitgadget@gmail.com>
305
306
@@ -236,29 +337,6 @@ Release tarballs are available at:
337
source: <20240506182317.13477-1-oystwa@gmail.com>
338
339
239
-* ps/ci-enable-minimal-fuzzers-at-gitlab (2024-05-06) 1 commit
240
- (merged to 'next' on 2024-05-07 at a76024bd9f)
241
- + gitlab-ci: add smoke test for fuzzers
242
- (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
243
-
244
- CI update.
245
-
246
- Will merge to 'master'.
247
- source: <01fb94999f8e2014ba4d09ce7451a4f5d315ee72.1714371146.git.ps@pks.im>
248
-
249
-
250
-* ps/ci-python-2-deprecation (2024-05-06) 1 commit
251
- (merged to 'next' on 2024-05-07 at 0e11e94f99)
252
- + ci: fix Python dependency on Ubuntu 24.04
253
- (this branch is used by ps/ci-fuzzers-at-gitlab-fix.)
254
-
255
- Unbreak CI jobs so that we do not attempt to use Python 2 that has
256
- been removed from the platform.
257
-
258
- Will merge to 'master'.
259
- source: <cb8cefc20f373a3516695e7cbee975132553ea95.1714973381.git.ps@pks.im>
260
-
261
-
340
* rs/external-diff-with-exit-code (2024-05-06) 2 commits
341
(merged to 'next' on 2024-05-08 at ad5fee3cbf)
342
+ diff: fix --exit-code with external diff
@@ -271,18 +349,6 @@ Release tarballs are available at:
349
source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>
350
351
274
-* jc/test-workaround-broken-mv (2024-05-02) 1 commit
275
- (merged to 'next' on 2024-05-06 at 7e009c6827)
276
- + t/lib-chunk: work around broken "mv" on some vintage of macOS
277
-
278
- Tests that try to corrupt in-repository files in chunked format did
279
- not work well on macOS due to its broken "mv", which has been
280
- worked around.
281
-
282
- Will merge to 'master'.
283
- source: <xmqqsez0c6ma.fsf@gitster.g>
284
-
285
-
352
* jt/port-ci-whitespace-check-to-gitlab (2024-05-03) 5 commits
353
(merged to 'next' on 2024-05-08 at 774a29dde4)
354
+ gitlab-ci: add whitespace error check
@@ -298,20 +364,6 @@ Release tarballs are available at:
364
source: <20240503172110.181326-1-jltobler@gmail.com>
365
366
301
-* jc/no-default-attr-tree-in-bare (2024-05-03) 1 commit
302
- (merged to 'next' on 2024-05-08 at a34819b16d)
303
- + stop using HEAD for attributes in bare repository by default
304
- (this branch is used by ps/undecided-is-not-necessarily-sha1.)
305
-
306
- Git 2.43 started using the tree of HEAD as the source of attributes
307
- in a bare repository, which has severe performance implications.
308
- For now, revert the change, without ripping out a more explicit
309
- support for the attr.tree configuration variable.
310
-
311
- Will merge to 'master'.
312
- source: <xmqqzft6aozg.fsf_-_@gitster.g>
313
-
314
-
367
* jl/git-no-advice (2024-05-07) 4 commits
368
(merged to 'next' on 2024-05-08 at c9e7e0866e)
369
+ t0018: two small fixes
@@ -345,16 +397,6 @@ Release tarballs are available at:
397
source: <20240507125859.132116-1-knayak@gitlab.com>
398
399
348
-* ma/win32-unix-domain-socket (2024-05-03) 1 commit
349
- (merged to 'next' on 2024-05-06 at 799a546c96)
350
- + win32: fix building with NO_UNIX_SOCKETS
351
-
352
- Build fix.
353
-
354
- Will merge to 'master'.
355
- source: <20240503091427.2808390-1-mh@glandium.org>
356
-
357
-
400
* ps/config-subcommands (2024-05-06) 14 commits
401
(merged to 'next' on 2024-05-07 at f10c689a30)
402
+ builtin/config: display subcommand help
@@ -397,7 +439,7 @@ Release tarballs are available at:
439
source: <cover.1715065736.git.ps@pks.im>
440
441
400
-* ps/reftable-write-options (2024-05-10) 11 commits
442
+* ps/reftable-write-options (2024-05-13) 11 commits
443
- refs/reftable: allow configuring geometric factor
444
- reftable: make the compaction factor configurable
445
- refs/reftable: allow disabling writing the object index
@@ -407,24 +449,14 @@ Release tarballs are available at:
449
- reftable/dump: support dumping a table's block structure
450
- reftable/writer: improve error when passed an invalid block size
451
- reftable/writer: drop static variable used to initialize strbuf
410
- - reftable: consistently pass write opts as value
452
+ - reftable: pass opts as constant pointer
453
- reftable: consistently refer to `reftable_write_options` as `opts`
454
455
The knobs to tweak how reftable files are written have been made
456
available as configuration variables.
457
416
- Will merge to 'next'?
417
- source: <cover.1715336797.git.ps@pks.im>
418
-
419
-
420
-* tb/attr-limits (2024-05-03) 1 commit
421
- (merged to 'next' on 2024-05-06 at b98150cc71)
422
- + attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
423
-
424
- The maximum size of attribute files is enforced more consistently.
425
-
426
- Will merge to 'master'.
427
- source: <28f6267709db78ba526d7ed9fc4a734674697c70.1714763555.git.me@ttaylorr.com>
458
+ Comments?
459
+ source: <cover.1715587849.git.ps@pks.im>
460
461
462
* ds/scalar-reconfigure-all-fix (2024-05-07) 1 commit
@@ -482,14 +514,14 @@ Release tarballs are available at:
514
+ path: harden validation of HEAD with non-standard hashes
515
+ Merge branch 'ps/the-index-is-no-more' into ps/undecided-is-not-necessarily-sha1
516
+ Merge branch 'jc/no-default-attr-tree-in-bare' into ps/undecided-is-not-necessarily-sha1
485
- (this branch uses jc/no-default-attr-tree-in-bare.)
517
+ (this branch is used by jc/undecided-is-not-necessarily-sha1-fix.)
518
519
Before discovering the repository details, We used to assume SHA-1
520
as the "default" hash function, which has been corrected. Hopefully
521
this will smoke out codepaths that rely on such an unwarranted
522
assumptions.
523
492
- Will merge to 'master'.
524
+ Will cook in 'next'.
525
source: <cover.1715057362.git.ps@pks.im>
526
527