What's cooking (2025/10 #10)
Junio C Hamano committed
Oct 27, 2025 at 08:17 UTC
670511c490fa0c9425975a7423e2bd2a2fa4c016
1 file changed
+58
-144
whats-cooking.txt
+58
-144
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2025, #09; Sat, 25)
3
-X-master-at: 4e98b730f18d59b670ee57b803e5048b9d14b968
4
-X-next-at: 1543da99c27235b2546b704d05475f87972d1197
2
+Subject: What's cooking in git.git (Oct 2025, #10; Mon, 27)
3
+X-master-at: 419c72cb8ada252b260efc38ff91fe201de7c8c3
4
+X-next-at: 38ec6c3e3b6da97b0b11a99adc78c386d413d9d8
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2025, #09; Sat, 25)
7
+What's cooking in git.git (Oct 2025, #10; Mon, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -46,126 +46,35 @@ Release tarballs are available at:
46
https://www.kernel.org/pub/software/scm/git/
47
48
--------------------------------------------------
49
-[Graduated to 'master']
50
-
51
-* jc/diff-from-contents-fix (2025-10-22) 1 commit
52
- (merged to 'next' on 2025-10-23 at fae07d2113)
53
- + diff: make sure the other caller of diff_flush_patch_quietly() is silent
54
- (this branch is used by ly/diff-name-only-with-diff-from-content; uses jk/diff-from-contents-fix.)
55
-
56
- The code to squelch output from "git diff -w --name-status"
57
- etc. for paths that "git diff -w -p" would have stayed silent
58
- leaked output from dry-run patch generation, which has been
59
- corrected.
60
- source: <xmqqy0p4wcac.fsf@gitster.g>
61
-
62
-
63
-* jc/t1016-setup-fix (2025-10-10) 1 commit
64
- (merged to 'next' on 2025-10-24 at 7d5464a96f)
65
- + t1016: make sure to use specified GPG
66
-
67
- GPG signing test set-up has been broken for a year, which has been
68
- corrected.
69
- source: <xmqqsefq7947.fsf@gitster.g>
70
-
71
-
72
-* jk/diff-from-contents-fix (2025-10-17) 2 commits
73
- (merged to 'next' on 2025-10-20 at 19442a804e)
74
- + diff: restore redirection to /dev/null for diff_from_contents
75
- + Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix
76
- (this branch is used by jc/diff-from-contents-fix and ly/diff-name-only-with-diff-from-content.)
77
-
78
- Recently we attempted to improve "git diff -w" and friends to
79
- handle cases where patch output would be suppressed, but it
80
- introduced a bug that emits unnecessary output, which has been
81
- corrected.
82
-
83
- Will merge to 'master' and then to 'maint'.
84
- source: <20251017083641.GB4073661@coredump.intra.peff.net>
85
-
86
-
87
-* jk/status-z-short-fix (2025-10-17) 1 commit
88
- (merged to 'next' on 2025-10-20 at 0d649c97b7)
89
- + status: make coloring of "-z --short" consistent
90
-
91
- The "--short" option of "git status" that meant output for humans
92
- and "-z" option to show NUL delimited output format did not mix
93
- well, and colored some but not all things. The command has been
94
- updated to color all elements consistently in such a case.
95
- source: <20251017084455.GA4096702@coredump.intra.peff.net>
96
-
97
-
98
-* js/t7500-pwd-windows-fix (2025-10-20) 1 commit
99
- (merged to 'next' on 2025-10-20 at d3996041e8)
100
- + t7500: fix tests with absolute path following ":(optional)" on Windows
101
-
102
- Test fix.
103
- source: <6a83c7d1-7cd4-432e-a0ab-7b18ce3af08d@kdbg.org>
104
-
105
-
106
-* ps/t7528-ssh-agent-uds-workaround (2025-10-23) 1 commit
107
- (merged to 'next' on 2025-10-23 at 9642f0746a)
108
- + t7528: work around ETOOMANY in OpenSSH 10.1 and newer
109
-
110
- Recent OpenSSH creates the Unix domain socket to communicate with
111
- ssh-agent under $HOME instead of /tmp, which causes our test to
112
- fail doe to overly long pathname in our test environment, which has
113
- been worked around by using "ssh-agent -T".
114
- source: <20251023-b4-pks-t7528-ssh-agent-socket-name-too-long-v1-1-f15eeec199f3@pks.im>
115
-
116
-
117
-* rj/doc-technical-fixes (2025-10-16) 4 commits
118
- (merged to 'next' on 2025-10-23 at 0af15d1860)
119
- + doc: add large-object-promisors.adoc to the docs build
120
- + doc: commit-graph.adoc: fix up some formatting
121
- + doc: sparse-checkout.adoc: fix asciidoc warnings
122
- + doc: remembering-renames.adoc: fix asciidoc warnings
123
-
124
- Documentation mark-up fixes.
125
- source: <20251016200301.1595204-1-ramsay@ramsayjones.plus.com>
126
-
127
-
128
-* rs/add-patch-document-p-for-pager (2025-10-21) 1 commit
129
- (merged to 'next' on 2025-10-22 at 7937ae0274)
130
- + add-patch: fully document option P
131
-
132
- Show 'P'ipe command in "git add -p".
133
- source: <0188c766-d788-476d-a4d4-f95a6f59b31b@web.de>
134
-
135
-
136
-* tb/unicode-width-table-17 (2025-10-21) 1 commit
137
- (merged to 'next' on 2025-10-22 at 6382b8bd44)
138
- + unicode: update the width tables to Unicode 17
139
-
140
- Unicode width table update.
141
- source: <20251021094849.93284-1-tboegi@web.de>
49
+[New Topics]
50
51
+* tu/credential-install (2025-10-25) 1 commit
52
+ - contrib/credential: add install target
53
144
-* tu/credential-makefile-updates (2025-10-20) 1 commit
145
- (merged to 'next' on 2025-10-22 at 1a8d65324c)
146
- + contrib/credential: harmonize Makefiles
54
+ Contributed credential helpers (obviously in contrib/) now have "cd
55
+ $there && make install" target.
56
148
- Build procedure for a few credential helpers (in contrib/) have
149
- been updated.
150
- source: <0a61b0b3-365b-c198-6afd-f26fcd5a9c20@mailbox.tu-dresden.de>
57
+ Will merge to 'next'.
58
+ source: <f67b3cbd-a117-a863-37ba-fbba7a2ca17a@mailbox.tu-dresden.de>
59
60
--------------------------------------------------
153
-[New Topics]
61
+[Cooking]
62
63
* jk/diff-patch-dry-run-cleanup (2025-10-24) 6 commits
156
- - diff: simplify run_external_diff() quiet logic
157
- - diff: drop dry-run redirection to /dev/null
158
- - diff: replace diff_options.dry_run flag with NULL file
159
- - diff: drop save/restore of color_moved in dry-run mode
160
- - diff: send external diff output to diff_options.file
161
- - Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-patch-dry-run-cleanup
64
+ (merged to 'next' on 2025-10-26 at 28426e9102)
65
+ + diff: simplify run_external_diff() quiet logic
66
+ + diff: drop dry-run redirection to /dev/null
67
+ + diff: replace diff_options.dry_run flag with NULL file
68
+ + diff: drop save/restore of color_moved in dry-run mode
69
+ + diff: send external diff output to diff_options.file
70
+ + Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-patch-dry-run-cleanup
71
(this branch uses ly/diff-name-only-with-diff-from-content.)
72
73
Finishing touches to fixes to the recent regression in "git diff -w
74
--quiet" and anything that needs to internally generate patch to
75
see if it turns empty.
76
168
- Will merge to 'next'.
77
+ Will merge to 'master'.
78
source: <20251024170522.GA2344972@coredump.intra.peff.net>
79
80
@@ -180,28 +89,28 @@ Release tarballs are available at:
89
90
91
* rs/merge-base-optim (2025-10-24) 1 commit
183
- - commit-reach: avoid commit_list_insert_by_date()
92
+ (merged to 'next' on 2025-10-26 at 45f9bd4b81)
93
+ + commit-reach: avoid commit_list_insert_by_date()
94
95
The code to walk revision graph to compute merge base has been
96
optimized.
97
188
- Will merge to 'next'.
98
+ Will merge to 'master'.
99
source: <87a00cb8-8faf-48ec-91aa-009e6e906363@web.de>
100
101
102
* rs/add-patch-quit (2025-10-24) 2 commits
193
- - add-patch: quit on EOF
194
- - add-patch: quit without skipping undecided hunks
103
+ (merged to 'next' on 2025-10-26 at 859e2555b2)
104
+ + add-patch: quit on EOF
105
+ + add-patch: quit without skipping undecided hunks
106
107
The 'q'(uit) command in "git add -p" has been improved to quit
108
without doing any meaningless work before leaving, and giving EOF
109
(typically control-D) to the prompt is made to behave the same way.
110
200
- Will merge to 'next'.
111
+ Will merge to 'master'.
112
source: <13529bee-1e02-4c20-9461-6569312bfe4f@web.de>
113
203
---------------------------------------------------
204
-[Cooking]
114
115
* ey/commit-graph-changed-paths-config (2025-10-17) 1 commit
116
(merged to 'next' on 2025-10-23 at 48fd936ff1)
@@ -255,14 +164,16 @@ Release tarballs are available at:
164
source: <20251024-b4-pks-rust-cbindgen-v2-0-4b4bd4f18490@pks.im>
165
166
258
-* jk/match-pathname-fix (2025-10-13) 1 commit
259
- - match_pathname(): give fnmatch one char of prefix context
167
+* jk/match-pathname-fix (2025-10-26) 2 commits
168
+ (merged to 'next' on 2025-10-26 at f18b45f0df)
169
+ + match_pathname(): give fnmatch one char of prefix context
170
+ + match_pathname(): reorder prefix-match check
171
172
The wildmatch code had a corner case bug that mistakenly makes
173
"foo**/bar" match with "foobar", which has been corrected.
174
264
- Will merge to 'next'.
265
- source: <20251014003404.GC1507@coredump.intra.peff.net>
175
+ Will merge to 'master'.
176
+ source: <20251026154036.GA2173430@coredump.intra.peff.net>
177
178
179
* kf/log-shortlog-completion-fix (2025-10-20) 1 commit
@@ -290,15 +201,14 @@ Release tarballs are available at:
201
source: <20251020-refs-code-cleanup-v2-0-f5349ed0f6a5@gmail.com>
202
203
293
-* lo/repo-info-all (2025-10-20) 2 commits
204
+* lo/repo-info-all (2025-10-26) 2 commits
205
- repo: add --all to git-repo-info
206
- repo: factor out field printing to dedicated function
207
208
"git repo info" learned "--all" option.
209
299
- Expecting a reroll.
300
- cf. <aPcduvnjD0yphja2@pks.im>
301
- source: <20251020181943.6314-1-lucasseikioshiro@gmail.com>
210
+ Will merge to 'next'?
211
+ source: <20251026225409.46647-1-lucasseikioshiro@gmail.com>
212
213
214
* ly/diff-name-only-with-diff-from-content (2025-10-19) 3 commits
@@ -332,24 +242,25 @@ Release tarballs are available at:
242
243
244
* ps/maintenance-geometric (2025-10-23) 11 commits
335
- - builtin/maintenance: introduce "geometric" strategy
336
- - builtin/maintenance: make "gc" strategy accessible
337
- - builtin/maintenance: extend "maintenance.strategy" to manual maintenance
338
- - builtin/maintenance: run maintenance tasks depending on type
339
- - builtin/maintenance: improve readability of strategies
340
- - builtin/maintenance: don't silently ignore invalid strategy
341
- - builtin/maintenance: make the geometric factor configurable
342
- - builtin/maintenance: introduce "geometric-repack" task
343
- - builtin/gc: make `too_many_loose_objects()` reusable without GC config
344
- - builtin/gc: remove global `repack` variable
345
- - Merge branch 'tb/incremental-midx-part-3.1' into ps/maintenance-geometric
245
+ (merged to 'next' on 2025-10-26 at 505f26dcf7)
246
+ + builtin/maintenance: introduce "geometric" strategy
247
+ + builtin/maintenance: make "gc" strategy accessible
248
+ + builtin/maintenance: extend "maintenance.strategy" to manual maintenance
249
+ + builtin/maintenance: run maintenance tasks depending on type
250
+ + builtin/maintenance: improve readability of strategies
251
+ + builtin/maintenance: don't silently ignore invalid strategy
252
+ + builtin/maintenance: make the geometric factor configurable
253
+ + builtin/maintenance: introduce "geometric-repack" task
254
+ + builtin/gc: make `too_many_loose_objects()` reusable without GC config
255
+ + builtin/gc: remove global `repack` variable
256
+ + Merge branch 'tb/incremental-midx-part-3.1' into ps/maintenance-geometric
257
(this branch uses tb/incremental-midx-part-3.1.)
258
259
"git maintenance" command learns the "geometric" strategy where it
260
avoids doing maintenance tasks that rebuilds everything from
261
scratch.
262
352
- Will merge to 'next'.
263
+ Will merge to 'master'.
264
source: <20251024-pks-maintenance-geometric-strategy-v3-0-9b5b3bdb4387@pks.im>
265
266
@@ -412,23 +323,26 @@ Release tarballs are available at:
323
324
325
* kh/doc-patch-id-1 (2025-10-13) 2 commits
415
- - doc: patch-id: convert to the modern synopsis style
416
- - Merge branch 'kh/doc-patch-id-markup-fix' into kh/doc-patch-id-1
326
+ (merged to 'next' on 2025-10-26 at e284077116)
327
+ + doc: patch-id: convert to the modern synopsis style
328
+ + Merge branch 'kh/doc-patch-id-markup-fix' into kh/doc-patch-id-1
329
418
- Will merge to 'next'.
330
+ Will merge to 'master'.
331
source: <v2-38645ea253c.1760369708.git.code@khaugsbakk.name>
332
333
422
-* tz/test-prepare-gnupghome (2024-07-03) 2 commits
334
+* tz/test-prepare-gnupghome (2025-10-25) 3 commits
335
+ - t1016: disable flakey tests
336
- t/lib-gpg: call prepare_gnupghome() in GPG2 prereq
337
- t/lib-gpg: add prepare_gnupghome() to create GNUPGHOME dir
338
339
Tests did not set up GNUPGHOME correctly, which is fixed but some
427
- bugs are exposed in t1016, which needs to be addressed before this
428
- topic can move forward.
340
+ flaky tests are exposed in t1016, which needs to be addressed
341
+ before this topic can move forward.
342
343
On hold.
344
cf. <ZoV8b2RvYxLOotSJ@teonanacatl.net>
345
+ cf. <xmqqbjlump3m.fsf@gitster.g>
346
source: <20240703153738.916469-1-tmz@pobox.com>
347
348