What's cooking (2025/10 #04)
Junio C Hamano committed
Oct 10, 2025 at 14:41 UTC
ef0f98845a70ba89da1feb3be1ec0dd0844c2a4e
1 file changed
+157
-201
whats-cooking.txt
+157
-201
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2025, #03; Wed, 8)
3
-X-master-at: 60f3f52f17cceefa5299709b189ce6fe2d181e7b
4
-X-next-at: 76037df0d4c651b3a9a2f6bee29233c1598da27c
2
+Subject: What's cooking in git.git (Oct 2025, #04; Fri, 10)
3
+X-master-at: 4b71b294773cc4f7fe48ec3a70079aa8783f373d
4
+X-next-at: f9c4a03a3a780b23d84ed893d98c5c8141d26374
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2025, #03; Wed, 8)
7
+What's cooking in git.git (Oct 2025, #04; Fri, 10)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,21 +45,128 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* en/doc-merge-tree-describe-merge-base (2025-10-02) 1 commit
52
+ (merged to 'next' on 2025-10-06 at 787ff6f08a)
53
+ + Documentation/git-merge-tree.adoc: clarify the --merge-base option
54
+
55
+ Clarify the "--merge-base" command line option in "git merge-tree".
56
+
57
+ source: <pull.1980.git.1759444487406.gitgitgadget@gmail.com>
58
+
59
+
60
+* ps/gitlab-ci-windows-improvements (2025-10-02) 5 commits
61
+ (merged to 'next' on 2025-10-03 at 6adb054d12)
62
+ + t8020: fix test failure due to indeterministic tag sorting
63
+ + gitlab-ci: upload Meson test logs as JUnit reports
64
+ + gitlab-ci: drop workaround for Python certificate store on Windows
65
+ + gitlab-ci: ignore failures to disable realtime monitoring
66
+ + gitlab-ci: dedup instructions to disable realtime monitoring
67
+ (this branch is used by ps/ci-rust.)
68
+
69
+ GitLab CI improvements.
70
+
71
+ source: <20251002-pks-gitlab-ci-windows-improvements-v1-0-6a8b6b45d728@pks.im>
72
+
73
+
74
+* rj/doc-missing-technical-docs (2025-10-02) 1 commit
75
+ (merged to 'next' on 2025-10-06 at f639955fdc)
76
+ + doc: add some missing technical documents
77
+ (this branch is used by rj/doc-technical-fixes.)
78
+
79
+ Doc updates.
80
+
81
+ source: <20251002221233.541844-2-ramsay@ramsayjones.plus.com>
82
+
83
--------------------------------------------------
84
[New Topics]
85
51
-* cc/fast-import-strip-signed-tags (2025-10-07) 5 commits
86
+* dk/stash-apply-index (2025-10-06) 1 commit
87
+ - doc: explain the impact of stash.index on --autostash options
88
+
89
+ Doc update.
90
+
91
+ Will merge to 'next'.
92
+ source: <d4a277b6b0695d86636562f4c07efae17f9249f9.1759755379.git.ben.knoble+github@gmail.com>
93
+
94
+
95
+* js/mingw-includes-cleanup (2025-10-09) 2 commits
96
+ - mingw: order `#include`s alphabetically
97
+ - mingw: avoid relative `#include`s
98
+
99
+ Code clean-up.
100
+
101
+ Will merge to 'next'.
102
+ source: <pull.1985.git.1759995961.gitgitgadget@gmail.com>
103
+
104
+
105
+* js/unreachable-workaround-for-no-symlink-head (2025-10-09) 1 commit
106
+ - refs: forbid clang to complain about unreachable code
107
+
108
+ Code clean-up.
109
+
110
+ Will merge to 'next'.
111
+ source: <pull.1984.git.1759995982220.gitgitgadget@gmail.com>
112
+
113
+
114
+* kh/doc-patch-id-1 (2025-10-09) 2 commits
115
+ - doc: patch-id: convert to the modern synopsis style
116
+ - Merge branch 'kh/doc-patch-id-markup-fix' into kh/doc-patch-id-1
117
+ (this branch uses kh/doc-patch-id-markup-fix.)
118
+
119
+ Expecting a reroll.
120
+ cf. <d0dcaea3-844f-497a-adca-6241bf39db41@free.fr>
121
+ source: <978261e3be4.1760043036.git.code@khaugsbakk.name>
122
+
123
+
124
+* tz/test-prepare-gnupghome (2024-07-03) 2 commits
125
+ - t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
126
+ - t/lib-gpg: add prepare_gnupghome() to create GNUPGHOME dir
127
+
128
+ Tests did not set up GNUPGHOME correctly, which is fixed but some
129
+ bugs are exposed in t1016, which needs to be addressed before this
130
+ topic can move forward.
131
+
132
+ On hold.
133
+ cf. <ZoV8b2RvYxLOotSJ@teonanacatl.net>
134
+ source: <20240703153738.916469-1-tmz@pobox.com>
135
+
136
+
137
+* jc/t1016-setup-fix (2025-10-10) 1 commit
138
+ - t1016: make sure to use specified GPG
139
+
140
+ GPG signing test set-up has been broken for a year, which has been
141
+ corrected.
142
+
143
+ Comments?
144
+ source: <xmqqsefq7947.fsf@gitster.g>
145
+
146
+* kh/doc-continued-paragraph-fix (2025-10-08) 1 commit
147
+ - doc: fix accidental literal blocks
148
+
149
+ Doc mark-up fixes.
150
+
151
+ Will merge to 'next'.
152
+ source: <7a955ecb1b5.1759923933.git.code@khaugsbakk.name>
153
+
154
+--------------------------------------------------
155
+[Cooking]
156
+
157
+* cc/fast-import-strip-signed-tags (2025-10-09) 5 commits
158
- fast-import: add '--signed-tags=<mode>' option
159
- fast-export: handle all kinds of tag signatures
160
- t9350: properly count annotated tags
55
- - lib-gpg: allow tests with the GPGSM prereq first
56
- - doc: git-tag: stop focussing on GPG signed tags
161
+ - lib-gpg: allow tests with GPGSM or GPGSSH prereq first
162
+ - doc: git-tag: stop focusing on GPG signed tags
163
164
"git fast-import" is taught to handle signed tags, just like it
165
recently learned to handle signed commits, in different ways.
166
61
- Comments?
62
- source: <20251007122958.1089680-1-christian.couder@gmail.com>
167
+ Expecting v3.
168
+ cf. <CAP8UFD10eMwKdacEzLumdXUghV2nYZViDT4o44u1qgXVU5Pzew@mail.gmail.com>
169
+ source: <20251009122457.1273701-1-christian.couder@gmail.com>
170
171
172
* ps/ci-rust (2025-10-07) 8 commits
@@ -71,15 +178,15 @@ Release tarballs are available at:
178
- ci: deduplicate calls to `apt-get update`
179
- Merge branch 'ps/gitlab-ci-windows-improvements' into ps/ci-rust
180
- Merge branch 'ps/rust-balloon' into ps/ci-rust
74
- (this branch uses ps/gitlab-ci-windows-improvements.)
181
182
CI improvements to handle the recent Rust integration better.
183
78
- Comments?
79
- source: <20251007-b4-pks-ci-rust-v1-0-394502abe7ea@pks.im>
184
+ Expecting an update.
185
+ cf. <aOdIRnB-SGQwj935@pks.im>
186
+ source: <20251008-b4-pks-ci-rust-v2-0-d556ee83c381@pks.im>
187
188
82
-* ps/ref-peeled-tags (2025-10-07) 13 commits
189
+* ps/ref-peeled-tags (2025-10-08) 14 commits
190
- ref-filter: parse objects on demand
191
- ref-filter: detect broken tags when dereferencing them
192
- refs: don't store peeled object IDs for invalid tags
@@ -91,19 +198,17 @@ Release tarballs are available at:
198
- upload-pack: convert to use `reference_get_peeled_oid()`
199
- refs: expose peeled object ID via the iterator
200
- refs: refactor reference status flags
201
+ - refs: fully reset `struct ref_iterator::ref` on iteration
202
- refs: introduce `.ref` field for the base iterator
203
- refs: introduce wrapper struct for `each_ref_fn`
204
205
Some ref backend storage can hold not just the object name of an
206
annotated tag, but the object name of the object the tag points at.
207
The code to handle this information has been streamlined.
208
+ source: <20251008-b4-pks-ref-filter-skip-parsing-objects-v2-0-76e30d5c9542@pks.im>
209
101
- Expecting v2.
102
- cf. <aOZqVAOjVboM3sm3@pks.im>
103
- source: <20251007-b4-pks-ref-filter-skip-parsing-objects-v1-0-916cc7c6886b@pks.im>
210
105
-
106
-* ps/remove-packfile-store-get-packs (2025-10-07) 7 commits
211
+* ps/remove-packfile-store-get-packs (2025-10-09) 7 commits
212
- packfile: rename `packfile_store_get_all_packs()`
213
- packfile: introduce macro to iterate through packs
214
- packfile: drop `packfile_store_get_packs()`
@@ -117,165 +222,41 @@ Release tarballs are available at:
222
has been cleaned up.
223
224
Comments?
120
- source: <20251007-pks-packfiles-convert-get-all-v1-0-428227657a89@pks.im>
225
+ source: <20251009-pks-packfiles-convert-get-all-v2-0-0d73b87ce711@pks.im>
226
227
228
* tb/doc-submitting-patches (2025-10-07) 2 commits
124
- - SubmittingPatches: guidance for multi-series efforts
125
- - SubmittingPatches: extend release-notes experiment to topic names
229
+ (merged to 'next' on 2025-10-10 at b63283990d)
230
+ + SubmittingPatches: guidance for multi-series efforts
231
+ + SubmittingPatches: extend release-notes experiment to topic names
232
233
A few more things that patch authors can do to help maintainer to
234
keep track of their topics better.
235
130
- Will merge to 'next'.
131
- source: <cover.1759873165.git.me@ttaylorr.com>
132
-
133
---------------------------------------------------
134
-[Graduated to 'master']
135
-
136
-* je/doc-push (2025-09-23) 2 commits
137
- (merged to 'next' on 2025-09-29 at 4ff1b675ed)
138
- + doc: git-push: rewrite refspec specification
139
- + doc: git-push: create PUSH RULES section
140
-
141
- Doc updates.
142
- source: <pull.1973.v2.git.1758651049.gitgitgadget@gmail.com>
143
-
144
-
145
-* js/curl-off-t-fixes (2025-09-26) 3 commits
146
- (merged to 'next' on 2025-09-30 at 6d1e5fd288)
147
- + http-push: avoid new compile error
148
- + imap-send: be more careful when casting to `curl_off_t`
149
- + http: offer to cast `size_t` to `curl_off_t` safely
150
-
151
- A few places where an size_t value was cast to curl_off_t without
152
- checking has been updated to use the existing helper function.
153
- source: <pull.1974.v2.git.1758882772.gitgitgadget@gmail.com>
154
-
155
-
156
-* jt/clang-format-foreach-wo-space-before-parenthesis (2025-09-27) 1 commit
157
- (merged to 'next' on 2025-09-30 at c32668ab36)
158
- + clang-format: exclude control macros from SpaceBeforeParens
159
-
160
- Clang-format update to let our control macros formatted the way we
161
- had them traditionally, e.g., "for_each_string_list_item()" without
162
- space before the parentheses.
163
- source: <20250927145049.723341-4-jltobler@gmail.com>
164
-
165
-
166
-* kn/ref-cache-seek-fix (2025-10-01) 1 commit
167
- (merged to 'next' on 2025-10-02 at 5896b8c896)
168
- + refs/ref-cache: fix SEGFAULT when seeking in empty directories
169
-
170
- Handling of an empty subdirectory of .git/refs/ in the ref-files
171
- backend has been corrected.
172
- source: <20251001-583-git-for-each-ref-start-after-v3-1-000f03837a92@gmail.com>
173
-
174
-
175
-* mh/doc-credential-url-prefix (2025-10-01) 1 commit
176
- (merged to 'next' on 2025-10-02 at dd0d9a1c59)
177
- + docs/gitcredentials: describe URL prefix matching
178
-
179
- Doc update to describe a feature that has already been implemented.
180
- source: <pull.1979.git.1759352209657.gitgitgadget@gmail.com>
181
-
182
-
183
-* ml/reflog-write-committer-info-fix (2025-09-30) 1 commit
184
- (merged to 'next' on 2025-10-02 at 9a61d07bac)
185
- + builtin/reflog: respect user config in "write" subcommand
186
-
187
- "git reflog write" did not honor the configured user.name/email
188
- which has been corrected.
189
- source: <20250930195320.23825-1-git@lohmann.sh>
190
-
191
-
192
-* ps/odb-clean-stale-wrappers (2025-09-10) 1 commit
193
- (merged to 'next' on 2025-09-30 at 90f1033b8c)
194
- + odb: drop deprecated wrapper functions
195
-
196
- Code clean-up.
197
- source: <20250910-b4-pks-odb-drop-wrappers-v1-1-6ed660cb1eec@pks.im>
198
-
199
-
200
-* ps/packfile-store (2025-09-23) 16 commits
201
- (merged to 'next' on 2025-09-29 at 342bb57fc2)
202
- + packfile: refactor `get_packed_git_mru()` to work on packfile store
203
- + packfile: refactor `get_all_packs()` to work on packfile store
204
- + packfile: refactor `get_packed_git()` to work on packfile store
205
- + packfile: move `get_multi_pack_index()` into "midx.c"
206
- + packfile: introduce function to load and add packfiles
207
- + packfile: refactor `install_packed_git()` to work on packfile store
208
- + packfile: split up responsibilities of `reprepare_packed_git()`
209
- + packfile: refactor `prepare_packed_git()` to work on packfile store
210
- + packfile: reorder functions to avoid function declaration
211
- + odb: move kept cache into `struct packfile_store`
212
- + odb: move MRU list of packfiles into `struct packfile_store`
213
- + odb: move packfile map into `struct packfile_store`
214
- + odb: move initialization bit into `struct packfile_store`
215
- + odb: move list of packfiles into `struct packfile_store`
216
- + packfile: introduce a new `struct packfile_store`
217
- + Merge branch 'ps/object-store-midx-dedup-info' into ps/packfile-store
218
- (this branch is used by tb/incremental-midx-part-3.1.)
219
-
220
- Code clean-up around the in-core list of all the pack files and
221
- object database(s).
222
- cf. <aNmxQqV3+1Ad12qC@nand.local>
223
- source: <20250923-b4-pks-packfiles-store-v6-0-b48f2a882759@pks.im>
224
-
225
-
226
-* ps/rust-balloon (2025-10-02) 9 commits
227
- (merged to 'next' on 2025-10-02 at fe4cdc2dfa)
228
- + ci: enable Rust for breaking-changes jobs
229
- + ci: convert "pedantic" job into full build with breaking changes
230
- + BreakingChanges: announce Rust becoming mandatory
231
- + varint: reimplement as test balloon for Rust
232
- + varint: use explicit width for integers
233
- + help: report on whether or not Rust is enabled
234
- + Makefile: introduce infrastructure to build internal Rust library
235
- + Makefile: reorder sources after includes
236
- + meson: add infrastructure to build internal Rust library
237
- (this branch is used by ps/ci-rust.)
238
-
239
- Dip our toes a bit to (optionally) use Rust implemented helper
240
- called from our C code.
241
- cf. <aNsQ5UjjbqJr8_Ik@fruit.crustytoothpaste.net>
242
- source: <20251002-b4-pks-rust-breaking-change-v8-0-3a89fd5b1ce7@pks.im>
243
-
244
---------------------------------------------------
245
-[Cooking]
246
-
247
-* en/doc-merge-tree-describe-merge-base (2025-10-02) 1 commit
248
- (merged to 'next' on 2025-10-06 at 787ff6f08a)
249
- + Documentation/git-merge-tree.adoc: clarify the --merge-base option
250
-
251
- Clarify the "--merge-base" command line option in "git merge-tree".
252
-
236
Will merge to 'master'.
254
- source: <pull.1980.git.1759444487406.gitgitgadget@gmail.com>
237
+ source: <cover.1759873165.git.me@ttaylorr.com>
238
239
257
-* je/doc-data-model (2025-10-07) 2 commits
258
- - fixup! doc: add a explanation of Git's data model
240
+* je/doc-data-model (2025-10-08) 1 commit
241
- doc: add a explanation of Git's data model
242
243
Add a new manual that describes the data model.
262
-
263
- Comments?
264
- source: <pull.1981.git.1759512876284.gitgitgadget@gmail.com>
244
+ source: <pull.1981.v2.git.1759931621272.gitgitgadget@gmail.com>
245
246
247
* rs/add-patch-options-fix (2025-10-06) 6 commits
268
- - add-patch: reset "permitted" at loop start
269
- - add-patch: let options a and d roll over like y and n
270
- - add-patch: let options k and K roll over like j and J
271
- - add-patch: let options y, n, j, and e roll over to next undecided
272
- - add-patch: document that option J rolls over
273
- - add-patch: improve help for options j, J, k, and K
248
+ (merged to 'next' on 2025-10-10 at ef52e0377e)
249
+ + add-patch: reset "permitted" at loop start
250
+ + add-patch: let options a and d roll over like y and n
251
+ + add-patch: let options k and K roll over like j and J
252
+ + add-patch: let options y, n, j, and e roll over to next undecided
253
+ + add-patch: document that option J rolls over
254
+ + add-patch: improve help for options j, J, k, and K
255
256
The code in "git add -p" and friends to iterate over hunks was
257
riddled with bugs, which has been corrected.
258
278
- Will merge to 'next'.
259
+ Will merge to 'master'.
260
source: <fe8e8097-2b05-4dd2-a754-f59e4ba5f95a@web.de>
261
262
@@ -391,65 +372,37 @@ Release tarballs are available at:
372
373
374
* en/make-libgit-a (2025-10-02) 2 commits
394
- - make: delete REFTABLE_LIB, add reftable to LIB_OBJS
395
- - make: delete XDIFF_LIB, add xdiff to LIB_OBJS
375
+ (merged to 'next' on 2025-10-10 at 913fc0337a)
376
+ + make: delete REFTABLE_LIB, add reftable to LIB_OBJS
377
+ + make: delete XDIFF_LIB, add xdiff to LIB_OBJS
378
379
Instead of three library archives (one for git, one for reftable,
380
and one for xdiff), roll everything into a single libgit.a archive.
381
This would help later effort to FFI into Rust.
382
401
- Will merge to 'next'.
383
+ Will merge to 'master'.
384
source: <pull.2065.v2.git.git.1759447647.gitgitgadget@gmail.com>
385
386
405
-* ms/doc-worktree-side-by-side (2025-10-02) 4 commits
406
- - amend! doc: git-worktree: Add side by side branch checkout example
387
+* ms/doc-worktree-side-by-side (2025-10-10) 2 commits
388
- doc: git-worktree: Add side by side branch checkout example
408
- - amend! doc: git-worktree: Link to examples
389
- doc: git-worktree: Link to examples
390
391
Document "git worktree add" and use of out-of-tree worktrees with
392
examples.
393
414
- Comments?
415
- source: <xmqqseg1xwc1.fsf@gitster.g>
416
-
417
-
418
-* ps/gitlab-ci-windows-improvements (2025-10-02) 5 commits
419
- (merged to 'next' on 2025-10-03 at 6adb054d12)
420
- + t8020: fix test failure due to indeterministic tag sorting
421
- + gitlab-ci: upload Meson test logs as JUnit reports
422
- + gitlab-ci: drop workaround for Python certificate store on Windows
423
- + gitlab-ci: ignore failures to disable realtime monitoring
424
- + gitlab-ci: dedup instructions to disable realtime monitoring
425
- (this branch is used by ps/ci-rust.)
426
-
427
- GitLab CI improvements.
428
-
429
- Will merge to 'master'.
430
- source: <20251002-pks-gitlab-ci-windows-improvements-v1-0-6a8b6b45d728@pks.im>
431
-
432
-
433
-* rj/doc-missing-technical-docs (2025-10-02) 1 commit
434
- (merged to 'next' on 2025-10-06 at f639955fdc)
435
- + doc: add some missing technical documents
436
- (this branch is used by rj/doc-technical-fixes.)
437
-
438
- Doc updates.
439
-
440
- Will merge to 'master'.
441
- source: <20251002221233.541844-2-ramsay@ramsayjones.plus.com>
394
+ Will merge to 'next'?
395
+ source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>
396
397
398
* rj/doc-technical-fixes (2025-10-02) 3 commits
399
- doc: commit-graph.adoc: fix up some formatting
400
- doc: sparse-checkout.adoc: fix asciidoc warnings
401
- doc: remembering-renames.adoc: fix asciidoc warnings
448
- (this branch uses rj/doc-missing-technical-docs.)
402
403
Documentation mark-up fixes.
404
452
- Expecting v3.
405
+ Expecting v3.
406
cf. <20251002221233.541844-1-ramsay@ramsayjones.plus.com>
407
source: <20251002221233.541844-1-ramsay@ramsayjones.plus.com>
408
@@ -483,6 +436,7 @@ Release tarballs are available at:
436
* kh/doc-patch-id-markup-fix (2025-09-29) 1 commit
437
(merged to 'next' on 2025-10-08 at a81dc9f7e6)
438
+ doc: patch-id: fix accidental literal blocks
439
+ (this branch is used by kh/doc-patch-id-1.)
440
441
Documentation mark-up fix.
442
@@ -519,7 +473,7 @@ Release tarballs are available at:
473
source: <v2-cover.1758819879.git.code@khaugsbakk.name>
474
475
522
-* je/doc-pull (2025-09-23) 4 commits
476
+* je/doc-pull (2025-10-08) 4 commits
477
- doc: git-pull: clarify how to exit a conflicted merge
478
- doc: git-pull: delete the example
479
- doc: git-pull: clarify options for integrating remote branch
@@ -527,8 +481,8 @@ Release tarballs are available at:
481
482
Documentation updates.
483
530
- Will replace with v2.
531
- source: <pull.1976.git.1758656702.gitgitgadget@gmail.com>
484
+ Will merge to 'next'?
485
+ source: <pull.1976.v2.git.1759951536.gitgitgadget@gmail.com>
486
487
488
* je/doc-push-upstream (2025-10-06) 5 commits
@@ -546,12 +500,15 @@ Release tarballs are available at:
500
501
502
* jk/diff-no-index-with-pathspec-fix (2025-09-24) 1 commit
549
- - diff --no-index: fix logic for paths ending in '/'
503
+ (merged to 'next' on 2025-10-10 at 75721dbc16)
504
+ + diff --no-index: fix logic for paths ending in '/'
505
506
An earlier addition to "git diff --no-index A B" to limit the
507
output with pathspec after the two directories misbehaved when
508
these directories were given with a trailing slash, which has been
509
corrected.
510
+
511
+ Will merge to 'master'.
512
source: <20250924-jk-fix-no-index-path-with-slash-v1-1-6b2028c0de92@intel.com>
513
514
@@ -586,7 +543,7 @@ Release tarballs are available at:
543
source: <20251007-228-reftable-introduce-consistency-checks-v6-0-638cff42f0b0@gmail.com>
544
545
589
-* bc/sha1-256-interop-01 (2025-10-02) 9 commits
546
+* bc/sha1-256-interop-01 (2025-10-09) 9 commits
547
- t1010: use BROKEN_OBJECTS prerequisite
548
- t: allow specifying compatibility hash
549
- fsck: consider gpgsig headers expected in tags
@@ -599,9 +556,8 @@ Release tarballs are available at:
556
557
The beginning of SHA1-SHA256 interoperability work.
558
602
- Expecting v3.
603
- cf. <aOA6z-kFCd78XtxX@fruit.crustytoothpaste.net>
604
- source: <20251002223855.1022847-1-sandals@crustytoothpaste.net>
559
+ Will merge to 'next'?
560
+ source: <20251009215626.3089287-1-sandals@crustytoothpaste.net>
561
562
563
* pw/add-p-hunk-splitting-fix (2025-09-25) 2 commits