What's cooking (2025/12 #07)
Junio C Hamano committed
Dec 22, 2025 at 22:14 UTC
0ac854e11fb89462c6ed9e911a9f98eca4374bf4
1 file changed
+157
-124
whats-cooking.txt
+157
-124
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2025, #06)
3
-X-master-at: c4a0c8845e2426375ad257b6c221a3a7d92ecfda
4
-X-next-at: 0814c687bbf7a1a1cb97b2be79c742b582fa80ea
2
+Subject: What's cooking in git.git (Dec 2025, #07)
3
+X-master-at: c8d76f7325e75c6f0549fce29ea4f3d97eb079cb
4
+X-next-at: a3e5c5e72d1c821d3e346fca55e6462e6d65d0fc
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Dec 2025, #06)
7
+What's cooking in git.git (Dec 2025, #07)
8
-----------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,9 +45,106 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* jc/macports-darwinports (2025-12-10) 1 commit
52
+ (merged to 'next' on 2025-12-14 at 5c608e07fe)
53
+ + Makefile: help macOS novices by mentioning MacPorts
54
+
55
+ Makefile in-comment doc update.
56
+ source: <xmqq7buthgq4.fsf@gitster.g>
57
+
58
+
59
+* kh/doc-replay-updates (2025-12-13) 3 commits
60
+ (merged to 'next' on 2025-12-14 at 71a8f83876)
61
+ + doc: replay: link section using markup
62
+ + replay: improve --contained and add to doc
63
+ + doc: replay: mention no output on conflicts
64
+
65
+ "git replay" documentation updates.
66
+ source: <V2_CV_replay_conflict.12f@msgid.xyz>
67
+
68
+
69
+* kj/pull-options-decl-cleanup (2025-12-11) 1 commit
70
+ (merged to 'next' on 2025-12-14 at f59cad1d37)
71
+ + pull: move options[] array into function scope
72
+
73
+ Code clean-up.
74
+ source: <20251212074433.38027-1-jayatheerthkulkarni2005@gmail.com>
75
+
76
+
77
+* ps/odb-alternates-object-sources (2025-12-11) 8 commits
78
+ (merged to 'next' on 2025-12-12 at 1dd061c0dc)
79
+ + odb: write alternates via sources
80
+ + odb: read alternates via sources
81
+ + odb: drop forward declaration of `read_info_alternates()`
82
+ + odb: remove mutual recursion when parsing alternates
83
+ + odb: stop splitting alternate in `odb_add_to_alternates_file()`
84
+ + odb: move computation of normalized objdir into `alt_odb_usable()`
85
+ + odb: resolve relative alternative paths when parsing
86
+ + odb: refactor parsing of alternates to be self-contained
87
+
88
+ Code refactoring around alternate object store.
89
+ source: <20251211-b4-pks-odb-alternates-via-source-v3-0-00e3f54d07ba@pks.im>
90
+
91
+
92
+* rs/replay-wrong-onto-fix (2025-12-11) 2 commits
93
+ (merged to 'next' on 2025-12-14 at d34966465f)
94
+ + replay: move onto NULL check before first use
95
+ + Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix
96
+
97
+ "git replay --onto=<commit> ...", when <commit> is mistyped,
98
+ started to segfault with recent change, which has been corrected.
99
+ source: <9db2b913-b5d6-4617-b079-b4612eaa2b97@web.de>
100
+
101
+
102
+* rs/t4014-git-version-string-fix (2025-12-13) 1 commit
103
+ (merged to 'next' on 2025-12-14 at eef802176c)
104
+ + t4014: support Git version strings with spaces
105
+
106
+ Test fix.
107
+ source: <b79cba1d-f32b-4034-979e-fb9528d05f18@web.de>
108
+
109
--------------------------------------------------
110
[New Topics]
111
112
+* sb/bundle-uri-without-uri (2025-12-19) 1 commit
113
+ - bundle-uri: validate that bundle entries have a uri
114
+
115
+ Diagnose invalid bundle-URI that lack the URI entry, instead of
116
+ crashing.
117
+
118
+ Will merge to 'next'?
119
+ source: <pull.2134.v2.git.git.1766160106521.gitgitgadget@gmail.com>
120
+
121
+
122
+* sb/doc-worktree-prune-expire-improvement (2025-12-19) 2 commits
123
+ - worktree: use 'prune' instead of 'expire' in help text
124
+ - worktree: clarify --expire applies to missing worktrees
125
+
126
+ The help text and the documentation for the "--expire" option of
127
+ "git worktree [list|prune]" have been improved.
128
+
129
+ Expecting a reroll.
130
+ source: <pull.2135.v2.git.git.1766168169.gitgitgadget@gmail.com>
131
+
132
+
133
+* ja/doc-synopsis-style-more (2025-12-20) 5 commits
134
+ - doc: convert git-remote to synopsis style
135
+ - doc: convert git stage to use synopsis block
136
+ - doc: convert git-status tables to AsciiDoc format
137
+ - doc: convert git-status to synopsis style
138
+ - doc: fix t0450-txt-doc-vs-help to select only first synopsis block
139
+
140
+ More doc style updates.
141
+
142
+ Will merge to 'next'?
143
+ source: <pull.2020.git.1766258187.gitgitgadget@gmail.com>
144
+
145
+--------------------------------------------------
146
+[Cooking]
147
+
148
* js/symlink-windows (2025-12-17) 19 commits
149
- mingw: special-case index entries for symlinks with buggy size
150
- mingw: emulate `stat()` a little more faithfully
@@ -77,11 +174,12 @@ Release tarballs are available at:
174
175
176
* mh/doc-core-attributesfile (2025-12-17) 1 commit
80
- - docs: note the type of core.attributesfile
177
+ (merged to 'next' on 2025-12-22 at 5d68c3ef97)
178
+ + docs: note the type of core.attributesfile
179
180
Doc update.
181
84
- Will merge to 'next'.
182
+ Will merge to 'master'.
183
source: <20251217195917.25710-1-matthewhughes934@gmail.com>
184
185
@@ -135,74 +233,76 @@ Release tarballs are available at:
233
source: <20251218-b4-pks-odb-read-object-info-improvements-v2-0-62e3e49072bc@pks.im>
234
235
138
-* jk/test-curl-updates (2025-12-18) 3 commits
139
- - t5563: relax whitespace assumptions for unfolded headers
236
+* jk/test-curl-updates (2025-12-18) 2 commits
237
- t5563: add missing end-of-line in HTTP header
238
- t5551: handle trailing slashes in expected cookies output
239
240
Update HTTP tests to adjust for changes in curl 8.18.0
241
145
- Will merge to 'next'?
146
- cf. <613s97no-7021-pp15-79s4-302o39p7n5r8@unkk.fr>
242
+ Will merge to 'next'.
243
source: <20251218121120.GA3252258@coredump.intra.peff.net>
244
245
246
* dk/ci-rust-fix (2025-12-18) 2 commits
151
- - rust: build correctly without GNU sed
152
- - Merge branch 'ps/ci-rust' into dk/ci-rust-fix
247
+ (merged to 'next' on 2025-12-22 at 5f7e5b040b)
248
+ + rust: build correctly without GNU sed
249
+ + Merge branch 'ps/ci-rust' into dk/ci-rust-fix
250
251
Build fix.
252
156
- Will merge to 'next'.
253
+ Will merge to 'master'.
254
source: <a33f4e5118938300bcd5b2991feeee855a1c8f86.1766100330.git.ben.knoble+github@gmail.com>
255
256
257
* gf/clear-path-cache-cleanup (2025-12-18) 1 commit
161
- - repository: remove duplicate free of cache->squash_msg
258
+ (merged to 'next' on 2025-12-22 at 748d7c2c93)
259
+ + repository: remove duplicate free of cache->squash_msg
260
261
Code clean-up.
262
165
- Will merge to 'next'.
263
+ Will merge to 'master'.
264
source: <pull.2132.v2.git.git.1766072952115.gitgitgadget@gmail.com>
265
266
267
* gf/maintenance-is-needed-fix (2025-12-18) 1 commit
170
- - refs: dereference the value of the required pointer
268
+ (merged to 'next' on 2025-12-22 at a84d7e8a32)
269
+ + refs: dereference the value of the required pointer
270
271
Brown-paper-bag fix to a recently graduated
272
'kn/maintenance-is-needed' topic.
273
175
- Will merge to 'next'.
274
+ Will merge to 'master'.
275
source: <pull.2130.git.git.1766074249443.gitgitgadget@gmail.com>
276
277
278
* js/test-func-comment-fix (2025-12-18) 1 commit
180
- - test_detect_ref_format: fix comment
279
+ (merged to 'next' on 2025-12-22 at 5eadd4ae77)
280
+ + test_detect_ref_format: fix comment
281
282
Comment fix.
283
184
- Will merge to 'next'.
284
+ Will merge to 'master'.
285
source: <pull.2019.git.1766071259531.gitgitgadget@gmail.com>
286
187
---------------------------------------------------
188
-[Cooking]
287
190
-* ja/doc-misc-fixes (2025-12-15) 1 commit
191
- (merged to 'next' on 2025-12-18 at d30d8cac71)
192
- + doc: flock of small fixes to various documentation files
288
+* ja/doc-misc-fixes (2025-12-19) 2 commits
289
+ (merged to 'next' on 2025-12-20 at 2dafdb9732)
290
+ + doc: correct minor wording issues
291
+ + doc: fix asciidoc markup issues in several files
292
293
Various documentation fixes.
294
295
Will merge to 'master'.
197
- source: <pull.2016.git.1765830229824.gitgitgadget@gmail.com>
296
+ source: <pull.2016.v2.git.1766170456.gitgitgadget@gmail.com>
297
298
299
* jt/doc-rev-list-filter-provided-objects (2025-12-15) 1 commit
201
- - docs: clarify git-rev-list(1) --filter behavior
300
+ (merged to 'next' on 2025-12-22 at 31970a567d)
301
+ + docs: clarify git-rev-list(1) --filter behavior
302
303
Document "rev-list --filter-provided-objects" better.
304
205
- Will merge to 'next'.
305
+ Will merge to 'master'.
306
source: <20251215200512.2694155-1-jltobler@gmail.com>
307
308
@@ -244,16 +344,6 @@ Release tarballs are available at:
344
source: <20251112223722.376330-1-aplattner@nvidia.com>
345
346
247
-* kj/pull-options-decl-cleanup (2025-12-11) 1 commit
248
- (merged to 'next' on 2025-12-14 at f59cad1d37)
249
- + pull: move options[] array into function scope
250
-
251
- Code clean-up.
252
-
253
- Will merge to 'master'.
254
- source: <20251212074433.38027-1-jayatheerthkulkarni2005@gmail.com>
255
-
256
-
347
* jc/memzero-array (2025-12-12) 3 commits
348
(merged to 'next' on 2025-12-17 at 0dd398f0b4)
349
+ cocci: use MEMZERO_ARRAY() a bit more
@@ -264,20 +354,10 @@ Release tarballs are available at:
354
Further application of MEMZERO_ARRAY() macro to the rest of the
355
code base.
356
267
- Will merge to 'next' together with the base topic.
357
+ Will merge to 'master' together with the base topic.
358
source: <20251213014628.3380826-1-gitster@pobox.com>
359
360
271
-* rs/t4014-git-version-string-fix (2025-12-13) 1 commit
272
- (merged to 'next' on 2025-12-14 at eef802176c)
273
- + t4014: support Git version strings with spaces
274
-
275
- Test fix.
276
-
277
- Will merge to 'master'.
278
- source: <b79cba1d-f32b-4034-979e-fb9528d05f18@web.de>
279
-
280
-
361
* jc/doc-commit-signoff-config (2025-12-19) 2 commits
362
(merged to 'next' on 2025-12-19 at 0814c687bb)
363
+ signoff-option: linkify the reference to gitfaq
@@ -325,18 +405,19 @@ Release tarballs are available at:
405
406
407
* jt/repo-struct-more-objinfo (2025-12-17) 7 commits
328
- - builtin/repo: add object disk size info to structure table
329
- - builtin/repo: add disk size info to keyvalue stucture output
330
- - builtin/repo: add inflated object info to structure table
331
- - builtin/repo: add inflated object info to keyvalue structure output
332
- - builtin/repo: humanise count values in structure output
333
- - strbuf: split out logic to humanise byte values
334
- - builtin/repo: group per-type object values into struct
408
+ (merged to 'next' on 2025-12-22 at d04904c31c)
409
+ + builtin/repo: add object disk size info to structure table
410
+ + builtin/repo: add disk size info to keyvalue stucture output
411
+ + builtin/repo: add inflated object info to structure table
412
+ + builtin/repo: add inflated object info to keyvalue structure output
413
+ + builtin/repo: humanise count values in structure output
414
+ + strbuf: split out logic to humanise byte values
415
+ + builtin/repo: group per-type object values into struct
416
417
More object database related information are shown in "git repo
418
structure" output.
419
339
- Will merge to 'next'.
420
+ Will merge to 'master'.
421
source: <20251217175404.37963-1-jltobler@gmail.com>
422
423
@@ -350,16 +431,6 @@ Release tarballs are available at:
431
source: <xmqqqzszc13d.fsf@gitster.g>
432
433
353
-* jc/macports-darwinports (2025-12-10) 1 commit
354
- (merged to 'next' on 2025-12-14 at 5c608e07fe)
355
- + Makefile: help macOS novices by mentioning MacPorts
356
-
357
- Makefile in-comment doc update.
358
-
359
- Will merge to 'master'.
360
- source: <xmqq7buthgq4.fsf@gitster.g>
361
-
362
-
434
* rs/macos-iconv-workaround (2025-12-16) 2 commits
435
- macOS: use iconv from Homebrew if present
436
- macOS: make Homebrew use configurable
@@ -371,18 +442,6 @@ Release tarballs are available at:
442
source: <53690064-1c98-40e9-8b9a-7ba6bee63703@web.de>
443
444
374
-* rs/replay-wrong-onto-fix (2025-12-11) 2 commits
375
- (merged to 'next' on 2025-12-14 at d34966465f)
376
- + replay: move onto NULL check before first use
377
- + Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix
378
-
379
- "git replay --onto=<commit> ...", when <commit> is mistyped,
380
- started to segfault with recent change, which has been corrected.
381
-
382
- Will merge to 'master'.
383
- source: <9db2b913-b5d6-4617-b079-b4612eaa2b97@web.de>
384
-
385
-
445
* tc/memzero-array (2025-12-10) 3 commits
446
(merged to 'next' on 2025-12-17 at 4d2f7755b5)
447
+ contrib/coccinelle: pass include paths to spatch(1)
@@ -399,18 +458,6 @@ Release tarballs are available at:
458
source: <20251210-toon-cocci-memzero-v1-0-ae916a79065b@iotcl.com>
459
460
402
-* kh/doc-replay-updates (2025-12-13) 3 commits
403
- (merged to 'next' on 2025-12-14 at 71a8f83876)
404
- + doc: replay: link section using markup
405
- + replay: improve --contained and add to doc
406
- + doc: replay: mention no output on conflicts
407
-
408
- "git replay" documentation updates.
409
-
410
- Will merge to 'master'.
411
- source: <V2_CV_replay_conflict.12f@msgid.xyz>
412
-
413
-
461
* lo/repo-info-keys (2025-12-09) 3 commits
462
- repo: add new flag --keys to git-repo-info
463
- repo: add a default output format to enum output_format
@@ -422,33 +469,17 @@ Release tarballs are available at:
469
source: <20251209194616.61620-1-lucasseikioshiro@gmail.com>
470
471
425
-* ps/odb-alternates-object-sources (2025-12-11) 8 commits
426
- (merged to 'next' on 2025-12-12 at 1dd061c0dc)
427
- + odb: write alternates via sources
428
- + odb: read alternates via sources
429
- + odb: drop forward declaration of `read_info_alternates()`
430
- + odb: remove mutual recursion when parsing alternates
431
- + odb: stop splitting alternate in `odb_add_to_alternates_file()`
432
- + odb: move computation of normalized objdir into `alt_odb_usable()`
433
- + odb: resolve relative alternative paths when parsing
434
- + odb: refactor parsing of alternates to be self-contained
435
-
436
- Code refactoring around alternate object store.
437
-
438
- Will merge to 'master'.
439
- source: <20251211-b4-pks-odb-alternates-via-source-v3-0-00e3f54d07ba@pks.im>
440
-
441
-
472
* ps/repack-avoid-noop-midx-rewrite (2025-12-10) 3 commits
443
- - midx-write: skip rewriting MIDX with `--stdin-packs` unless needed
444
- - midx-write: extract function to test whether MIDX needs updating
445
- - midx: fix `BUG()` when getting preferred pack without a reverse index
473
+ (merged to 'next' on 2025-12-22 at 0d3b9de55c)
474
+ + midx-write: skip rewriting MIDX with `--stdin-packs` unless needed
475
+ + midx-write: extract function to test whether MIDX needs updating
476
+ + midx: fix `BUG()` when getting preferred pack without a reverse index
477
478
Even when there is no changes in the packfile and no need to
479
recompute bitmaps, "git repack" recomputed and updated the MIDX
480
file, which has been corrected.
481
451
- Will merge to 'next'.
482
+ Will merge to 'master'.
483
cf.
484
source: <20251210-pks-skip-noop-rewrite-v2-0-f813a9e44f28@pks.im>
485
@@ -564,22 +595,23 @@ Release tarballs are available at:
595
596
597
* js/test-symlink-windows (2025-12-17) 10 commits
567
- - t7800: work around the MSYS path conversion on Windows
568
- - t6423: introduce Windows-specific handling for symlinking to /dev/null
569
- - t1305: skip symlink tests that do not apply to Windows
570
- - t1006: accommodate for symlink support in MSYS2
571
- - t0600: fix incomplete prerequisite for a test case
572
- - t0301: another fix for Windows compatibility
573
- - t0001: handle `diff --no-index` gracefully
574
- - mingw: special-case `open(symlink, O_CREAT | O_EXCL)`
575
- - apply: symbolic links lack a "trustable executable bit"
576
- - t9700: accommodate for Windows paths
598
+ (merged to 'next' on 2025-12-22 at 3eaa789d0d)
599
+ + t7800: work around the MSYS path conversion on Windows
600
+ + t6423: introduce Windows-specific handling for symlinking to /dev/null
601
+ + t1305: skip symlink tests that do not apply to Windows
602
+ + t1006: accommodate for symlink support in MSYS2
603
+ + t0600: fix incomplete prerequisite for a test case
604
+ + t0301: another fix for Windows compatibility
605
+ + t0001: handle `diff --no-index` gracefully
606
+ + mingw: special-case `open(symlink, O_CREAT | O_EXCL)`
607
+ + apply: symbolic links lack a "trustable executable bit"
608
+ + t9700: accommodate for Windows paths
609
(this branch is used by js/prep-symlink-windows and js/symlink-windows.)
610
611
Prepare test suite for Git for Windows that supports symbolic
612
links.
613
582
- Will merge to 'next'.
614
+ Will merge to 'master'.
615
source: <pull.2009.v4.git.1765981126.gitgitgadget@gmail.com>
616
617
@@ -802,7 +834,8 @@ Release tarballs are available at:
834
source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>
835
836
805
-* ar/submodule-gitdir-tweak (2025-12-13) 10 commits
837
+* ar/submodule-gitdir-tweak (2025-12-20) 11 commits
838
+ - submodule: detect conflicts with existing gitdir configs
839
- submodule: hash the submodule name for the gitdir path
840
- submodule: fix case-folding gitdir filesystem collisions
841
- submodule--helper: fix filesystem collisions by encoding gitdir paths
@@ -819,7 +852,7 @@ Release tarballs are available at:
852
components.
853
854
Comments?
822
- source: <20251213080817.347922-1-adrian.ratiu@collabora.com>
855
+ source: <20251220101528.1227487-1-adrian.ratiu@collabora.com>
856
857
--------------------------------------------------
858
[Discarded]