What's cooking (2025/11 #05)
Junio C Hamano committed
Nov 17, 2025 at 08:37 UTC
cb4b603d9736ee77e4fef18c143f9418dbd41b2c
1 file changed
+75
-72
whats-cooking.txt
+75
-72
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2025, #04; Fri, 14)
3
-X-master-at: fd372d9b1a69a01a676398882bbe3840bf51fe72
4
-X-next-at: 230fcf2819a6e6e5372cd128168db10ebbe23885
2
+Subject: What's cooking in git.git (Nov 2025, #05; Mon, 17)
3
+X-master-at: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
4
+X-next-at: d25c4c69ec8b0378f9f865f96ae5cd33842cdcb3
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2025, #04; Fri, 14)
7
+What's cooking in git.git (Nov 2025, #05; Mon, 17)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,11 @@ 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.52 (final) has been tagged. We'll see if there is a need for
21
+a quick brown paper bag fix necessary for some days and then reopen
22
+the tree for the 2.53 cycle, to start merging topics that have been
23
+cooking in "next" down to "master".
24
+
25
Copies of the source code to Git live in many repositories, and the
26
following is a list of the ones I push into or their mirrors. Some
27
repositories have only a subset of branches.
@@ -48,42 +53,32 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
51
-* dk/make-git-contacts-executable (2025-11-04) 1 commit
52
- (merged to 'next' on 2025-11-07 at 30608eb744)
53
- + perl: also mark git-contacts executable
54
-
55
- Building "git contacts" script (in contrib/) left the resulting
56
- file unexecutable, which has been corrected.
57
- source: <7fbb341e8f05fcde3a1543e3bb4e5a3ec1101692.1762280097.git.ben.knoble+github@gmail.com>
58
-
59
-
60
-* dk/meson-html-dir (2025-11-04) 1 commit
61
- (merged to 'next' on 2025-11-07 at b30cf1f060)
62
- + meson: make GIT_HTML_PATH configurable
56
+* jc/ci-use-arm64-p4-on-macos (2025-11-16) 1 commit
57
+ (merged to 'next' on 2025-11-16 at c784b1ea9f)
58
+ + Use Perforce arm64 binary on macOS CI jobs
59
64
- The build procedure based on meson learned to allow builders to
65
- specify the directory to install HTML documents.
66
- source: <385992f6020703558f0ba75a1be6c4f9dae08b83.1762264709.git.ben.knoble+github@gmail.com>
60
+ We replaced deprecated macos-13 with macos-14 image in GitHub
61
+ Actions CI, but we forgot that the image is for arm64. We have
62
+ been seeing a lot of test failures ever since. Switch to arm64
63
+ binary for Perforce tests.
64
+ source: <xmqqy0o5bml7.fsf@gitster.g>
65
66
+--------------------------------------------------
67
+[New Topics]
68
69
-* tc/last-modified-active-paths-optimization (2025-10-23) 1 commit
70
- (merged to 'next' on 2025-11-03 at 9ab444edfb)
71
- + last-modified: implement faster algorithm
72
-
73
- "git last-modified" was optimized by narrowing the set of paths to
74
- follow as it dug deeper in the history.
75
- source: <20251023-b4-toon-last-modified-faster-v3-1-40a4ddbbadec@iotcl.com>
76
-
69
+* jc/submodule-add (2025-11-15) 1 commit
70
+ - submodule add: sanity check existing .gitmodules
71
78
-* tu/credential-wincred-makefile-update (2025-11-05) 1 commit
79
- (merged to 'next' on 2025-11-07 at ed74befe91)
80
- + wincred: align Makefile with other Makefiles in contrib
72
+ "git submodule add" to add a submodule under <name> segfaulted,
73
+ when a submodule.<name>.something is already in .gitmodules file
74
+ without defining where its submodule.<name>.path is, which has been
75
+ corrected.
76
82
- Build procedure for Wincred credential helper has been updated.
83
- source: <3869ec21-e20d-cf9b-5913-6389c372a5f0@mailbox.tu-dresden.de>
77
+ Comments?
78
+ source: <xmqqv7jacvdq.fsf@gitster.g>
79
80
--------------------------------------------------
86
-[New Topics]
81
+[Cooking]
82
83
* rs/diff-quiet-no-rename (2025-11-09) 1 commit
84
(merged to 'next' on 2025-11-14 at 2d94808185)
@@ -117,6 +112,7 @@ Release tarballs are available at:
112
has been corrected.
113
114
Will merge to 'next'?
115
+ cf. <xmqqtsytbk5w.fsf@gitster.g>
116
source: <20251113-fix-tags-not-fetching-v5-0-371ea7ec638d@gmail.com>
117
118
@@ -140,36 +136,30 @@ Release tarballs are available at:
136
137
138
* jk/attr-macroexpand-wo-recursion (2025-11-11) 1 commit
143
- - attr: avoid recursion when expanding attribute macros
139
+ (merged to 'next' on 2025-11-16 at c4e4a7348e)
140
+ + attr: avoid recursion when expanding attribute macros
141
142
The code to expand attribute macros has been rewritten to avoid
143
recursion to avoid running out of stack space in an uncontrolled
144
way.
145
149
- Will merge to 'next'?
146
+ Will cook in 'next'.
147
source: <20251111223647.GA4055973@coredump.intra.peff.net>
148
149
153
-* bc/submodule-force-same-hash (2025-11-12) 1 commit
154
- - object-file: disallow adding submodules of different hash algo
150
+* bc/submodule-force-same-hash (2025-11-14) 2 commits
151
+ (merged to 'next' on 2025-11-16 at aa765fefd0)
152
+ + read-cache: drop submodule check from add_to_cache()
153
+ + object-file: disallow adding submodules of different hash algo
154
155
Adding a repository that uses a different hash function is a no-no,
156
but "git submodule add" did nt prevent it, which has been corrected.
157
159
- Will merge to 'next'?
158
+ Will cook in 'next'.
159
source: <20251112235434.1499699-1-sandals@crustytoothpaste.net>
160
161
163
-* jc/ci-drop-p4-macosx (2025-11-14) 1 commit
164
- - CI: drop Perforce tests from macOSX jobs
165
-
166
- Drop P4 tests on macOSX platform on GitHub Actions CI.
167
-
168
- Comments?
169
- source: <xmqqqzu0gxq2.fsf_-_@gitster.g>
170
-
171
-
172
-* jx/repo-struct-utf8width-fix (2025-11-13) 2 commits
162
+* jx/repo-struct-utf8width-fix (2025-11-15) 2 commits
163
- builtin/repo: fix table alignment for UTF-8 characters
164
- t/unit-tests: add UTF-8 width tests for CJK chars
165
@@ -177,8 +167,8 @@ Release tarballs are available at:
167
mixed up byte count and display column width, which has been
168
corrected.
169
180
- Comments?
181
- source: <cover.1763098804.git.worldhello.net@gmail.com>
170
+ Will merge to 'next'.
171
+ source: <cover.1763213290.git.worldhello.net@gmail.com>
172
173
174
* kh/doc-commit-extra-references (2025-11-14) 1 commit
@@ -186,7 +176,7 @@ Release tarballs are available at:
176
177
Doc update.
178
189
- Will merge to 'next'?
179
+ Will merge to 'next'.
180
source: <c4349a03724.1763129061.git.code@khaugsbakk.name>
181
182
@@ -198,11 +188,9 @@ Release tarballs are available at:
188
credential material supplied by other helper backends that it would
189
have wanted to store, which has been corrected.
190
201
- Will merge to 'next'?
191
+ Will merge to 'next'.
192
source: <pull.1999.v2.git.1763100270949.gitgitgadget@gmail.com>
193
204
---------------------------------------------------
205
-[Cooking]
194
195
* lc/rebase-trailer (2025-11-05) 4 commits
196
- rebase: support --trailer
@@ -213,7 +201,8 @@ Release tarballs are available at:
201
Refactor code paths to run "interpret-trailers" from "git
202
commit/tag" and use it in "git rebase".
203
216
- Comments?
204
+ Expecting a reroll.
205
+ cf. <19a8fe42354.3909481a3912041.7970296104893780556@linux.beauty>
206
source: <20251105142944.73061-1-me@linux.beauty>
207
208
@@ -237,7 +226,8 @@ Release tarballs are available at:
226
Yet another corner case fix around renames in the "ort" merge
227
strategy.
228
240
- Will merge to 'next'?
229
+ Will merge to 'next' after locally amending?
230
+ cf. <xmqqfradbhgi.fsf@gitster.g>
231
source: <pull.1992.git.1762192908.gitgitgadget@gmail.com>
232
233
@@ -264,7 +254,7 @@ Release tarballs are available at:
254
255
Doc update.
256
267
- Will merge to 'next'?
257
+ Will merge to 'next'.
258
source: <20251105143849.1192-1-qjessa662@gmail.com>
259
260
@@ -279,17 +269,16 @@ Release tarballs are available at:
269
source: <xmqqtsz9o3cn.fsf@gitster.g>
270
271
282
-* cc/fast-import-strip-if-invalid (2025-11-04) 3 commits
283
- . fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
284
- . commit: refactor verify_commit_buffer()
285
- . fast-import: refactor finalize_commit_buffer()
272
+* cc/fast-import-strip-if-invalid (2025-11-16) 3 commits
273
+ - fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
274
+ - commit: refactor verify_commit_buffer()
275
+ - fast-import: refactor finalize_commit_buffer()
276
277
"git fast-import" learns "--strip-if-invalid" option to drop
278
invalid cryptographic signature from objects.
279
290
- Expecting a reroll. Its test does not work well with existing tests
291
- cf. <xmqqjz00e5ns.fsf@gitster.g>
292
- source: <20251105061918.3688870-1-christian.couder@gmail.com>
280
+ Comments?
281
+ source: <20251117043450.322644-1-christian.couder@gmail.com>
282
283
284
* jc/whitespace-incomplete-line (2025-11-12) 12 commits
@@ -309,7 +298,7 @@ Release tarballs are available at:
298
Both "git apply" and "git diff" learn a new whitespace error class,
299
"incomplete-line".
300
312
- Comments?
301
+ Will merge to 'next'?
302
source: <20251112220258.1009253-1-gitster@pobox.com>
303
304
@@ -331,7 +320,7 @@ Release tarballs are available at:
320
A part of code paths that deals with loose objects has been cleaned
321
up.
322
334
- Will merge to 'next'?
323
+ Will merge to 'next'.
324
source: <20251103-b4-pks-odb-loose-backend-v3-0-6a61ea977393@pks.im>
325
326
@@ -367,6 +356,7 @@ Release tarballs are available at:
356
"git blame" learns "--diff-algorithm=<algo>" option.
357
358
Will merge to 'next'?
359
+ cf. <xmqq5xb9bgx2.fsf@gitster.g>
360
source: <pull.2075.v5.git.git.1762468914.gitgitgadget@gmail.com>
361
362
@@ -414,7 +404,7 @@ Release tarballs are available at:
404
source: <20251026225409.46647-1-lucasseikioshiro@gmail.com>
405
406
417
-* en/xdiff-cleanup-2 (2025-11-11) 10 commits
407
+* en/xdiff-cleanup-2 (2025-11-14) 10 commits
408
- xdiff: rename rindex -> reference_index
409
- xdiff: change rindex from long to size_t in xdfile_t
410
- xdiff: make xdfile_t.nreff a size_t instead of long
@@ -428,8 +418,10 @@ Release tarballs are available at:
418
419
Code clean-up.
420
431
- Comments?
432
- source: <pull.2070.v3.git.git.1762890152.gitgitgadget@gmail.com>
421
+ Expecting a (hopefully small and final) reroll.
422
+ cf. <xmqqy0o7g0rk.fsf@gitster.g>
423
+ cf. <xmqqzf8la20o.fsf@gitster.g>
424
+ source: <pull.2070.v4.git.git.1763159816.gitgitgadget@gmail.com>
425
426
427
* ar/run-command-hook (2025-10-17) 10 commits
@@ -520,7 +512,7 @@ Release tarballs are available at:
512
513
"git history" history rewriting UI.
514
523
- Comments?
515
+ Will merge to 'next' after the base topic.
516
source: <20251027-b4-pks-history-builtin-v6-0-407dd3f57ad3@pks.im>
517
518
@@ -546,7 +538,8 @@ Release tarballs are available at:
538
in a transaction by default, instead of emitting where each refs
539
should point at and leaving the actual update to another command.
540
549
- Will merge to 'next'?
541
+ Will merge to 'next'.
542
+ cf. <00a5a8f3-f761-46e8-84cc-4bd95db68b49@gmail.com>
543
source: <20251105191650.89975-1-siddharthasthana31@gmail.com>
544
545
@@ -560,7 +553,8 @@ Release tarballs are available at:
553
each other by encoding submodule names before using them as path
554
components.
555
563
- Comments?
556
+ Seems to leak and break CI
557
+ cf. <xmqq346ff56h.fsf@gitster.g>
558
source: <20251107150547.3272180-1-adrian.ratiu@collabora.com>
559
560
--------------------------------------------------
@@ -580,3 +574,12 @@ Release tarballs are available at:
574
Retracted.
575
cf. <aQ3XOTX0AT_eFc5P@pks.im>
576
source: <20251024-b4-pks-rust-cbindgen-v2-0-4b4bd4f18490@pks.im>
577
+
578
+
579
+* jc/ci-drop-p4-macosx (2025-11-14) 1 commit
580
+ . CI: drop Perforce tests from macOSX jobs
581
+
582
+ Drop P4 tests on macOSX platform on GitHub Actions CI.
583
+
584
+ Retracted. Superseded by jc/ci-use-arm64-p4-on-macos topic.
585
+ source: <xmqqqzu0gxq2.fsf_-_@gitster.g>