What's cooking (2025/06 #09)
Junio C Hamano committed
Jun 27, 2025 at 15:02 UTC
7af8e2e03484fee5f211fbb0406c7d70ecdd94f1
1 file changed
+295
-236
whats-cooking.txt
+295
-236
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2025, #08; Mon, 23)
3
-X-master-at: cb3b40381e1d5ee32dde96521ad7cfd68eb308a6
4
-X-next-at: 7c2003159bacce310b20a522e641b9749eb67935
2
+Subject: What's cooking in git.git (Jun 2025, #09; Fri, 27)
3
+X-master-at: cf6f63ea6bf35173e02e18bdc6a4ba41288acff9
4
+X-next-at: 74e6fc65d04915ff3f8c8a5d11580286182b8854
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Jun 2025, #08; Mon, 23)
7
+What's cooking in git.git (Jun 2025, #09; Fri, 27)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -45,21 +45,241 @@ Release tarballs are available at:
45
46
https://www.kernel.org/pub/software/scm/git/
47
48
+--------------------------------------------------
49
+[Graduated to 'master']
50
+
51
+* ac/preload-index-wo-the-repository (2025-06-10) 2 commits
52
+ (merged to 'next' on 2025-06-18 at fe9378f663)
53
+ + preload-index: stop depending on 'the_repository'
54
+ + environment: remove the global variable 'core_preload_index'
55
+
56
+ Code clean-up.
57
+ source: <cover.1749557133.git.ayu.chandekar@gmail.com>
58
+
59
+
60
+* ag/send-email-edit-threading-fix (2025-06-04) 2 commits
61
+ (merged to 'next' on 2025-06-18 at dfe9cb890c)
62
+ + send-email: show the new message id assigned by outlook in the logs
63
+ + send-email: fix bug resulting in broken threads if a message is edited
64
+
65
+ "git send-email" incremented its internal message counter when a
66
+ message was edited, which made logic that treats the first message
67
+ specially misbehave, which has been corrected.
68
+ source: <PN3PR01MB95979AA8114CA26405BE02CFB86CA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
69
+
70
+
71
+* jc/cg-let-bss-do-its-job (2025-06-11) 1 commit
72
+ (merged to 'next' on 2025-06-18 at 5166eea328)
73
+ + CodingGuidelines: let BSS do its job
74
+
75
+ Clarify "do not explicitly initialize to zero" rule in the
76
+ CodingGuidelines document.
77
+ source: <xmqqh60mger9.fsf@gitster.g>
78
+
79
+
80
+* jc/diff-no-index-with-pathspec-fix (2025-06-18) 1 commit
81
+ (merged to 'next' on 2025-06-20 at 936407d5ef)
82
+ + diff-no-index: do not reference .d_type member of struct dirent
83
+
84
+ Recent code added a direct access to the d_type member in "struct
85
+ dirent", but some platforms lack it, which has been corrected.
86
+ source: <xmqqh60ces03.fsf@gitster.g>
87
+
88
+
89
+* jc/you-still-use-whatchanged (2025-05-12) 6 commits
90
+ (merged to 'next' on 2025-06-18 at b28af0a02c)
91
+ + whatschanged: list it in BreakingChanges document
92
+ + whatchanged: remove when built with WITH_BREAKING_CHANGES
93
+ + whatchanged: require --i-still-use-this
94
+ + tests: prepare for a world without whatchanged
95
+ + doc: prepare for a world without whatchanged
96
+ + you-still-use-that??: help deprecating commands for removal
97
+
98
+ "git whatchanged" that is longer to type than "git log --raw"
99
+ which is its modern rough equivalent has outlived its usefulness
100
+ more than 10 years ago. Plan to deprecate and remove it.
101
+ source: <20250512190311.1451556-1-gitster@pobox.com>
102
+
103
+
104
+* jg/mailinfo-leakfix (2025-06-13) 1 commit
105
+ (merged to 'next' on 2025-06-20 at 3ef4f7f41c)
106
+ + mailinfo.c: fix memory leak in function handle_content_type()
107
+
108
+ Leakfix.
109
+ source: <SA1PR22MB399911638F342E1AA20F014AE477A@SA1PR22MB3999.namprd22.prod.outlook.com>
110
+
111
+
112
+* kj/stash-onbranch-submodule-fix (2025-06-10) 1 commit
113
+ (merged to 'next' on 2025-06-18 at 1ac7a03f69)
114
+ + stash: fix incorrect branch name in stash message
115
+
116
+ "git stash" recorded a wrong branch name when submodules are
117
+ present in the current checkout, which has been corrected.
118
+ source: <20250611014204.24994-1-jayatheerthkulkarni2005@gmail.com>
119
+
120
+
121
+* ly/prepare-show-merge-leakfix (2025-06-09) 1 commit
122
+ (merged to 'next' on 2025-06-18 at 11ab005b9c)
123
+ + revision: fix memory leak in prepare_show_merge()
124
+
125
+ Leakfix.
126
+ source: <pull.1989.v3.git.git.1749515879546.gitgitgadget@gmail.com>
127
+
128
+
129
+* ly/run-builtin-use-passed-in-repo (2025-06-15) 1 commit
130
+ (merged to 'next' on 2025-06-18 at ae732fef47)
131
+ + git.c: remove the_repository dependence in run_builtin()
132
+
133
+ Code clean-up.
134
+ source: <20250616062233.1589172-1-502024330056@smail.nju.edu.cn>
135
+
136
+
137
+* ps/maintenance-ref-lock (2025-06-03) 12 commits
138
+ (merged to 'next' on 2025-06-18 at 724574661a)
139
+ + builtin/maintenance: fix locking race when handling "gc" task
140
+ + builtin/gc: avoid global state in `gc_before_repack()`
141
+ + usage: allow dying without writing an error message
142
+ + builtin/maintenance: fix locking race with refs and reflogs tasks
143
+ + builtin/maintenance: split into foreground and background tasks
144
+ + builtin/maintenance: fix typedef for function pointers
145
+ + builtin/maintenance: extract function to run tasks
146
+ + builtin/maintenance: stop modifying global array of tasks
147
+ + builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
148
+ + builtin/maintenance: centralize configuration of explicit tasks
149
+ + builtin/gc: drop redundant local variable
150
+ + builtin/gc: use designated field initializers for maintenance tasks
151
+
152
+ "git maintenance" lacked the care "git gc" had to avoid holding
153
+ onto the repository lock for too long during packing refs, which
154
+ has been remedied.
155
+ source: <20250603-b4-pks-maintenance-ref-lock-race-v4-0-52f5cf7b7e99@pks.im>
156
+
157
+
158
+* pw/stash-p-pathspec-fixes (2025-06-07) 2 commits
159
+ (merged to 'next' on 2025-06-18 at 10cfc8865f)
160
+ + stash: allow "git stash [<options>] --patch <pathspec>" to assume push
161
+ + stash: allow "git stash -p <pathspec>" to assume push again
162
+
163
+ "git stash -p <pathspec>" improvements.
164
+ source: <cover.1749289514.git.phillip.wood@dunelm.org.uk>
165
+
166
+
167
+* pw/subtree-gpg-sign (2025-06-04) 2 commits
168
+ (merged to 'next' on 2025-06-18 at d3c6435b4f)
169
+ + contrib/subtree: add -S/--gpg-sign
170
+ + contrib/subtree: parse using --stuck-long
171
+
172
+ "git subtree" (in contrib/) learns to grok GPG signing its commits.
173
+ source: <pull.1928.v2.git.1749046597.gitgitgadget@gmail.com>
174
+
175
+
176
+* rm/t2400-modernize (2025-06-16) 1 commit
177
+ (merged to 'next' on 2025-06-18 at 58c4f9560c)
178
+ + t2400: replace 'test -[efd]' with 'test_path_is_*'
179
+
180
+ Test clean-up.
181
+ source: <20250617002939.24478-1-rodmichelassi@gmail.com>
182
+
183
+
184
+* sa/multi-mailmap-fix (2025-06-13) 1 commit
185
+ (merged to 'next' on 2025-06-18 at c492804406)
186
+ + cat-file: fix mailmap application for different author and committer
187
+
188
+ When asking to apply mailmap to both author and committer field
189
+ while showing a commit object, the field that appears later was not
190
+ correctly parsed and replaced, which has been corrected.
191
+ source: <20250613115750.41205-1-siddharthasthana31@gmail.com>
192
+
193
--------------------------------------------------
194
[New Topics]
195
196
+* cb/daemon-reap-children (2025-06-26) 4 commits
197
+ - daemon: explicitly allow EINTR during poll()
198
+ - daemon: use sigaction() to install child_handler()
199
+ - compat/mingw: allow sigaction(SIGCHLD)
200
+ - compat/posix.h: track SA_RESTART fallback
201
+
202
+ Futz with SIGCHLD handling in "git daemon".
203
+
204
+ Comments?
205
+ source: <pull.2002.v3.git.git.1750927988.gitgitgadget@gmail.com>
206
+
207
+
208
+* ac/auto-comment-char-fix (2025-06-26) 1 commit
209
+ - commit: avoid scanning trailing comments when 'core.commentChar' is "auto"
210
+
211
+ "git commit" that concludes a conflicted merge failed to notice and remove
212
+ existing comment added automatically (like "# Conflicts:") when the
213
+ core.commentstring is set to 'auto'.
214
+
215
+ Expecting a reroll.
216
+ cf. <91982162-b138-4bb1-81fd-6f9185801c99@gmail.com>
217
+ source: <20250626221631.457725-1-ayu.chandekar@gmail.com>
218
+
219
+
220
+* cb/daemon-fd-check-fix (2025-06-26) 1 commit
221
+ - daemon: remove unnecesary restriction for listener fd
222
+
223
+ Remove unnecessary check from "git daemon" code.
224
+
225
+ Will merge to 'next'.
226
+ source: <20250626095139.70751-1-carenas@gmail.com>
227
+
228
+
229
+* cb/daemon-retry-interrupted-accept (2025-06-26) 1 commit
230
+ - daemon: correctly handle soft accept() errors in service_loop
231
+
232
+ When "git daemon" sees a signal while attempting to accept() a new
233
+ client, instead of retrying, it skipped it by mistake, which has
234
+ been corrected.
235
+
236
+ Expecting a reroll, separating out the unrelated change.
237
+ cf. <08804dbe-56dd-4c0e-b36b-a82768b0aa29@gmail.com>
238
+ source: <20250626172159.87204-1-carenas@gmail.com>
239
+
240
+
241
+* kn/clang-format-updates (2025-06-25) 4 commits
242
+ - meson: add rule to run 'git clang-format'
243
+ - clang-format: add 'RemoveBracesLLVM' to the main config
244
+ - clang-format: set 'ColumnLimit' to 0
245
+ - editorconfig: set maximum line length to 120 characters
246
+
247
+ Update ".clang-format" and ".editorconfig" to match our style guide
248
+ a bit better.
249
+
250
+ Expecting a (small and hopefully final) reroll.
251
+ cf. <iutm4xxkhchcpfygtqo2s4nit42sclzen63465ljtovzgdsebr@okpj5jtw62r6>
252
+ source: <20250625-525-make-clang-format-more-robust-v1-0-67a49ecc2fd5@gmail.com>
253
+
254
+
255
+* ly/changed-paths-traversal (2025-06-27) 3 commits
256
+ - fixup?
257
+ - bloom: optimize multiple pathspec items in revision traversal
258
+ - bloom: replace struct bloom_key * with struct bloom_keyvec
259
+
260
+ Lift the limitation to use changed-path filter in "git log" so that
261
+ it can be used for a pathspec with multiple literal paths.
262
+
263
+ Expecting a reroll.
264
+ cf. <4A56A595-55B1-4EEB-9B9E-3E9F7A9A74D4@smail.nju.edu.cn>
265
+ source: <20250625125541.3048632-1-502024330056@smail.nju.edu.cn>
266
+
267
+--------------------------------------------------
268
+[Cooking]
269
+
270
* jk/test-seq-format (2025-06-23) 2 commits
52
- - test-lib: teach test_seq the -f option
53
- - t7422: replace confusing printf with echo
271
+ (merged to 'next' on 2025-06-24 at 6726b890cb)
272
+ + test-lib: teach test_seq the -f option
273
+ + t7422: replace confusing printf with echo
274
275
A test helper "test_seq" function learned the "-f <fmt>" option,
276
which allowed us to simplify a lot of test scripts.
277
58
- Will merge to 'next'.
278
+ Will merge to 'master'.
279
source: <20250623105516.GA654296@coredump.intra.peff.net>
280
281
62
-* mc/netrc-service-names (2025-06-22) 3 commits
282
+* mc/netrc-service-names (2025-06-25) 3 commits
283
- contrib: better support symbolic port names in git-credential-netrc
284
- contrib: warn for invalid netrc file ports in git-credential-netrc
285
- contrib: use a more portable shebang for git-credential-netrc
@@ -68,18 +288,20 @@ Release tarballs are available at:
288
service names (like smtp) in addition to the numeric port numbers
289
(like 25).
290
71
- Comments.
72
- source: <20250620041239.27839-1-maxim@guixotic.coop>
291
+ Ready?
292
+ source: <20250625142511.28857-1-maxim@guixotic.coop>
293
294
295
* ph/fetch-prune-optim (2025-06-23) 2 commits
296
- refs: remove old refs_warn_dangling_symref
297
- fetch-prune: optimize dangling-ref reporting
298
299
+ "git fetch --prune" used to be O(n^2) expensive when there are many
300
+ refs, which has been corrected.
301
+
302
+ Will merge to 'next'?
303
source: <20250623234327.335490-1-phil.hord@gmail.com>
304
81
---------------------------------------------------
82
-[Cooking]
305
306
* bc/use-sha256-by-default-in-3.0 (2025-06-19) 10 commits
307
- Enable SHA-256 by default in breaking changes mode
@@ -128,19 +350,20 @@ Release tarballs are available at:
350
"make coccicheck" succeeds even when spatch made suggestions, which
351
has been updated to fail in such a case.
352
131
- Needs review.
353
+ Will merge to 'next'?
354
source: <xmqqbjqe77vw.fsf@gitster.g>
355
356
357
* jt/imap-send-message-fix (2025-06-20) 3 commits
136
- - imap-send: improve error messages with configuration hints
137
- - imap-send: fix confusing 'store' terminology in error message
138
- - Merge branch 'ag/imap-send-resurrection' into jt/imap-send-message-fix
358
+ (merged to 'next' on 2025-06-24 at 106e5c22eb)
359
+ + imap-send: improve error messages with configuration hints
360
+ + imap-send: fix confusing 'store' terminology in error message
361
+ + Merge branch 'ag/imap-send-resurrection' into jt/imap-send-message-fix
362
(this branch uses ag/imap-send-resurrection.)
363
364
Update some error messages from "git imap-send".
365
143
- Will merge to 'next'.
366
+ Will merge to 'master'.
367
source: <20250620155614.901816-1-joerg@thalheim.io>
368
369
@@ -156,7 +379,7 @@ Release tarballs are available at:
379
A new subcommand "git repo-info" gives users a way to grab various
380
repository characteristics.
381
159
- Needs review.
382
+ Expecting a reroll, if only to fix "make check-docs".
383
source: <20250619225751.99699-1-lucasseikioshiro@gmail.com>
384
385
@@ -183,60 +406,20 @@ Release tarballs are available at:
406
407
408
* jk/submodule-remote-lookup-cleanup (2025-06-23) 7 commits
186
- - submodule: look up remotes by URL first
187
- - submodule: move get_default_remote_submodule()
188
- - submodule--helper: improve logic for fallback remote name
189
- - remote: remove the_repository from some functions
190
- - dir: move starts_with_dot(_dot)_slash to dir.h
191
- - remote: fix tear down of struct remote
192
- - remote: remove branch->merge_name and fix branch_release()
409
+ (merged to 'next' on 2025-06-24 at 0354a7779f)
410
+ + submodule: look up remotes by URL first
411
+ + submodule: move get_default_remote_submodule()
412
+ + submodule--helper: improve logic for fallback remote name
413
+ + remote: remove the_repository from some functions
414
+ + dir: move starts_with_dot(_dot)_slash to dir.h
415
+ + remote: fix tear down of struct remote
416
+ + remote: remove branch->merge_name and fix branch_release()
417
418
Updating submodules from the upstream did not work well when
419
submodule's HEAD is detached, which has been improved.
420
197
- Will merge to 'next'.
198
- source: <20250623-jk-submodule-helper-use-url-v4-0-133ef3d89569@gmail.com>
199
-
200
-
201
-* ly/run-builtin-use-passed-in-repo (2025-06-15) 1 commit
202
- (merged to 'next' on 2025-06-18 at ae732fef47)
203
- + git.c: remove the_repository dependence in run_builtin()
204
-
205
- Code clean-up.
206
-
207
- Will merge to 'master'.
208
- source: <20250616062233.1589172-1-502024330056@smail.nju.edu.cn>
209
-
210
-
211
-* rm/t2400-modernize (2025-06-16) 1 commit
212
- (merged to 'next' on 2025-06-18 at 58c4f9560c)
213
- + t2400: replace 'test -[efd]' with 'test_path_is_*'
214
-
215
- Test clean-up.
216
-
217
- Will merge to 'master'.
218
- source: <20250617002939.24478-1-rodmichelassi@gmail.com>
219
-
220
-
221
-* jc/diff-no-index-with-pathspec-fix (2025-06-18) 1 commit
222
- (merged to 'next' on 2025-06-20 at 936407d5ef)
223
- + diff-no-index: do not reference .d_type member of struct dirent
224
-
225
- Recent code added a direct access to the d_type member in "struct
226
- dirent", but some platforms lack it, which has been corrected.
227
-
228
- Will merge to 'master'.
229
- source: <xmqqh60ces03.fsf@gitster.g>
230
-
231
-
232
-* jg/mailinfo-leakfix (2025-06-13) 1 commit
233
- (merged to 'next' on 2025-06-20 at 3ef4f7f41c)
234
- + mailinfo.c: fix memory leak in function handle_content_type()
235
-
236
- Leakfix.
237
-
421
Will merge to 'master'.
239
- source: <SA1PR22MB399911638F342E1AA20F014AE477A@SA1PR22MB3999.namprd22.prod.outlook.com>
422
+ source: <20250623-jk-submodule-helper-use-url-v4-0-133ef3d89569@gmail.com>
423
424
425
* ow/rebase-verify-insn-fmt-before-initializing-state (2025-06-09) 1 commit
@@ -246,65 +429,22 @@ Release tarballs are available at:
429
failed to produce the todo file after recording the state files,
430
leading to confused "git status"; this has been corrected.
431
249
- Comments?
250
- cf. <20250609221055.136074-1-oystwa@gmail.com>
432
+ Expecting a reroll.
433
+ cf. <7e796844-97e2-4b45-a76e-4c1fcb1da3ae@gmail.com>
434
source: <20250609221055.136074-1-oystwa@gmail.com>
435
436
254
-* ac/preload-index-wo-the-repository (2025-06-10) 2 commits
255
- (merged to 'next' on 2025-06-18 at fe9378f663)
256
- + preload-index: stop depending on 'the_repository'
257
- + environment: remove the global variable 'core_preload_index'
258
-
259
- Code clean-up.
260
-
261
- Will merge to 'master'.
262
- source: <cover.1749557133.git.ayu.chandekar@gmail.com>
263
-
264
-
265
-* jc/cg-let-bss-do-its-job (2025-06-11) 1 commit
266
- (merged to 'next' on 2025-06-18 at 5166eea328)
267
- + CodingGuidelines: let BSS do its job
268
-
269
- Clarify "do not explicitly initialize to zero" rule in the
270
- CodingGuidelines document.
271
-
272
- Will merge to 'master'.
273
- source: <xmqqh60mger9.fsf@gitster.g>
274
-
275
-
437
* jc/merge-compact-summary (2025-06-12) 2 commits
277
- - merge/pull: extend merge.stat configuration variable to cover --compact-summary
278
- - merge/pull: add the "--compact-summary" option
438
+ (merged to 'next' on 2025-06-24 at 29893fdca6)
439
+ + merge/pull: extend merge.stat configuration variable to cover --compact-summary
440
+ + merge/pull: add the "--compact-summary" option
441
442
"git merge/pull" has been taught the "--compact-summary" option to
443
use the compact-summary format, intead of diffstat, when showing
444
the summary of the incoming changes.
445
284
- Will merge to 'next'.
285
- source: <20250612222537.2426059-1-gitster@pobox.com>
286
-
287
-
288
-* ly/prepare-show-merge-leakfix (2025-06-09) 1 commit
289
- (merged to 'next' on 2025-06-18 at 11ab005b9c)
290
- + revision: fix memory leak in prepare_show_merge()
291
-
292
- Leakfix.
293
-
294
- Will merge to 'master'.
295
- source: <pull.1989.v3.git.git.1749515879546.gitgitgadget@gmail.com>
296
-
297
-
298
-* sa/multi-mailmap-fix (2025-06-13) 1 commit
299
- (merged to 'next' on 2025-06-18 at c492804406)
300
- + cat-file: fix mailmap application for different author and committer
301
-
302
- When asking to apply mailmap to both author and committer field
303
- while showing a commit object, the field that appears later was not
304
- correctly parsed and replaced, which has been corrected.
305
-
446
Will merge to 'master'.
307
- source: <20250613115750.41205-1-siddharthasthana31@gmail.com>
447
+ source: <20250612222537.2426059-1-gitster@pobox.com>
448
449
450
* bs/config-mak-freebsd (2025-06-12) 1 commit
@@ -359,17 +499,6 @@ Release tarballs are available at:
499
source: <pull.1933.git.1749373787.gitgitgadget@gmail.com>
500
501
362
-* kj/stash-onbranch-submodule-fix (2025-06-10) 1 commit
363
- (merged to 'next' on 2025-06-18 at 1ac7a03f69)
364
- + stash: fix incorrect branch name in stash message
365
-
366
- "git stash" recorded a wrong branch name when submodules are
367
- present in the current checkout, which has been corrected.
368
-
369
- Will merge to 'master'.
370
- source: <20250611014204.24994-1-jayatheerthkulkarni2005@gmail.com>
371
-
372
-
502
* ag/imap-send-resurrection (2025-06-19) 10 commits
503
(merged to 'next' on 2025-06-23 at 7c2003159b)
504
+ imap-send: fix minor mistakes in the logs
@@ -391,17 +520,6 @@ Release tarballs are available at:
520
source: <PN3PR01MB9597F9CAD0DA83152E651194B87CA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
521
522
394
-* pw/subtree-gpg-sign (2025-06-04) 2 commits
395
- (merged to 'next' on 2025-06-18 at d3c6435b4f)
396
- + contrib/subtree: add -S/--gpg-sign
397
- + contrib/subtree: parse using --stuck-long
398
-
399
- "git subtree" (in contrib/) learns to grok GPG signing its commits.
400
-
401
- Will merge to 'master'.
402
- source: <pull.1928.v2.git.1749046597.gitgitgadget@gmail.com>
403
-
404
-
523
* sk/reftable-clarify-tests (2025-06-05) 10 commits
524
- t/unit-tests: finalize migration of reftable-related tests
525
- t/unit-tests: convert reftable stack test to use clar
@@ -422,19 +540,6 @@ Release tarballs are available at:
540
source: <20250605140644.239199-1-kuforiji98@gmail.com>
541
542
425
-* ag/send-email-edit-threading-fix (2025-06-04) 2 commits
426
- (merged to 'next' on 2025-06-18 at dfe9cb890c)
427
- + send-email: show the new message id assigned by outlook in the logs
428
- + send-email: fix bug resulting in broken threads if a message is edited
429
-
430
- "git send-email" incremented its internal message counter when a
431
- message was edited, which made logic that treats the first message
432
- specially misbehave, which has been corrected.
433
-
434
- Will merge to 'master'.
435
- source: <PN3PR01MB95979AA8114CA26405BE02CFB86CA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
436
-
437
-
543
* ly/load-bitmap-leakfix (2025-06-02) 3 commits
544
- pack-bitmap: add load corrupt bitmap test
545
- pack-bitmap: reword comments in test_bitmap_commits()
@@ -446,29 +551,6 @@ Release tarballs are available at:
551
source: <pull.1962.v5.git.git.1748920444.gitgitgadget@gmail.com>
552
553
449
-* ps/maintenance-ref-lock (2025-06-03) 12 commits
450
- (merged to 'next' on 2025-06-18 at 724574661a)
451
- + builtin/maintenance: fix locking race when handling "gc" task
452
- + builtin/gc: avoid global state in `gc_before_repack()`
453
- + usage: allow dying without writing an error message
454
- + builtin/maintenance: fix locking race with refs and reflogs tasks
455
- + builtin/maintenance: split into foreground and background tasks
456
- + builtin/maintenance: fix typedef for function pointers
457
- + builtin/maintenance: extract function to run tasks
458
- + builtin/maintenance: stop modifying global array of tasks
459
- + builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
460
- + builtin/maintenance: centralize configuration of explicit tasks
461
- + builtin/gc: drop redundant local variable
462
- + builtin/gc: use designated field initializers for maintenance tasks
463
-
464
- "git maintenance" lacked the care "git gc" had to avoid holding
465
- onto the repository lock for too long during packing refs, which
466
- has been remedied.
467
-
468
- Will merge to 'master'.
469
- source: <20250603-b4-pks-maintenance-ref-lock-race-v4-0-52f5cf7b7e99@pks.im>
470
-
471
-
554
* tb/prepare-midx-pack-cleanup (2025-05-28) 5 commits
555
- midx: return a `packed_git` pointer from `prepare_midx_pack()`
556
- midx-write.c: extract inner loop from fill_packs_from_midx()
@@ -483,40 +565,19 @@ Release tarballs are available at:
565
source: <cover.1748473122.git.me@ttaylorr.com>
566
567
486
-* pw/stash-p-pathspec-fixes (2025-06-07) 2 commits
487
- (merged to 'next' on 2025-06-18 at 10cfc8865f)
488
- + stash: allow "git stash [<options>] --patch <pathspec>" to assume push
489
- + stash: allow "git stash -p <pathspec>" to assume push again
490
-
491
- "git stash -p <pathspec>" improvements.
492
-
493
- Will merge to 'master'.
494
- source: <cover.1749289514.git.phillip.wood@dunelm.org.uk>
495
-
496
-
497
-* kn/fetch-push-bulk-ref-update (2025-05-19) 4 commits
568
+* kn/fetch-push-bulk-ref-update (2025-06-20) 6 commits
569
+ - receive-pack: handle reference deletions separately
570
+ - refs/files: skip updates with errors in batched updates
571
- receive-pack: use batched reference updates
572
- send-pack: fix memory leak around duplicate refs
573
- fetch: use batched reference updates
574
- refs: add function to translate errors to strings
502
- (this branch is used by kn/fetch-push-bulk-ref-update-fixup.)
575
576
"git push" and "git fetch" are taught to update refs in batches to
577
gain performance.
578
507
- Tentatively kicked out of 'next' to give its fix-up topic a chance to reboot.
579
+ Will merge to 'next'.
580
source: <20250519-501-update-git-fetch-1-to-use-partial-transactions-v3-0-6cdfd4f769b9@gmail.com>
509
-
510
-
511
-* kn/fetch-push-bulk-ref-update-fixup (2025-06-20) 3 commits
512
- - receive-pack: handle reference deletions separately
513
- - refs/files: skip updates with errors in batched updates
514
- - Merge branch 'kn/fetch-push-bulk-ref-update' into kn/fetch-push-bulk-ref-update-fixup
515
- (this branch uses kn/fetch-push-bulk-ref-update.)
516
-
517
- Additional fixes to the base topic.
518
-
519
- Comments?
581
source: <20250620-6769-address-test-failures-in-the-next-branch-caused-by-batched-reference-updates-v5-0-f35ee6b59a82@gmail.com>
582
583
@@ -533,15 +594,16 @@ Release tarballs are available at:
594
595
596
* bc/stash-export-import (2025-06-11) 4 commits
536
- - builtin/stash: provide a way to import stashes from a ref
537
- - builtin/stash: provide a way to export stashes to a ref
538
- - builtin/stash: factor out revision parsing into a function
539
- - object-name: make get_oid quietly return an error
597
+ (merged to 'next' on 2025-06-24 at 3dfd301fa1)
598
+ + builtin/stash: provide a way to import stashes from a ref
599
+ + builtin/stash: provide a way to export stashes to a ref
600
+ + builtin/stash: factor out revision parsing into a function
601
+ + object-name: make get_oid quietly return an error
602
603
An interchange format for stash entries is defined, and subcommand
604
of "git stash" to import/export has been added.
605
544
- Will merge to 'next'.
606
+ Will merge to 'master'.
607
source: <20250612011221.4158484-1-sandals@crustytoothpaste.net>
608
609
@@ -560,21 +622,22 @@ Release tarballs are available at:
622
623
624
* ps/contrib-sweep (2025-05-12) 11 commits
563
- - contrib: remove some scripts in "stats" directory
564
- - contrib: remove "git-new-workdir"
565
- - contrib: remove "emacs" directory
566
- - contrib: remove "git-resurrect.sh"
567
- - contrib: remove "persistent-https" remote helper
568
- - contrib: remove "mw-to-git"
569
- - contrib: remove "hooks" directory
570
- - contrib: remove "thunderbird-patch-inline"
571
- - contrib: remove remote-helper stubs
572
- - contrib: remove "examples" directory
573
- - contrib: remove "remotes2config.sh"
625
+ (merged to 'next' on 2025-06-24 at 5d97a089a8)
626
+ + contrib: remove some scripts in "stats" directory
627
+ + contrib: remove "git-new-workdir"
628
+ + contrib: remove "emacs" directory
629
+ + contrib: remove "git-resurrect.sh"
630
+ + contrib: remove "persistent-https" remote helper
631
+ + contrib: remove "mw-to-git"
632
+ + contrib: remove "hooks" directory
633
+ + contrib: remove "thunderbird-patch-inline"
634
+ + contrib: remove remote-helper stubs
635
+ + contrib: remove "examples" directory
636
+ + contrib: remove "remotes2config.sh"
637
638
Remove bunch of stuff from contrib/ hierarchy.
639
577
- Will merge to 'next'.
640
+ Will merge to 'master'.
641
source: <20250512-pks-contrib-spring-cleanup-v3-0-32e151b0bfb0@pks.im>
642
643
@@ -603,7 +666,7 @@ Release tarballs are available at:
666
source: <20250605-pks-object-store-wo-the-repository-v5-0-779d1c28774b@pks.im>
667
668
606
-* cc/promisor-remote-capability (2025-06-11) 5 commits
669
+* cc/promisor-remote-capability (2025-06-25) 5 commits
670
- promisor-remote: use string constants for 'name' and 'url' too
671
- promisor-remote: allow a client to check fields
672
- promisor-remote: refactor how we parse advertised fields
@@ -614,25 +677,8 @@ Release tarballs are available at:
677
allow the "partialCloneFilter" settings and the "token" value to be
678
communicated from the server side.
679
617
- Comments?
618
- source: <20250611134506.2975856-1-christian.couder@gmail.com>
619
-
620
-
621
-* jc/you-still-use-whatchanged (2025-05-12) 6 commits
622
- (merged to 'next' on 2025-06-18 at b28af0a02c)
623
- + whatschanged: list it in BreakingChanges document
624
- + whatchanged: remove when built with WITH_BREAKING_CHANGES
625
- + whatchanged: require --i-still-use-this
626
- + tests: prepare for a world without whatchanged
627
- + doc: prepare for a world without whatchanged
628
- + you-still-use-that??: help deprecating commands for removal
629
-
630
- "git whatchanged" that is longer to type than "git log --raw"
631
- which is its modern rough equivalent has outlived its usefulness
632
- more than 10 years ago. Plan to deprecate and remove it.
633
-
634
- Will merge to 'master'.
635
- source: <20250512190311.1451556-1-gitster@pobox.com>
680
+ Ready?
681
+ source: <20250625125055.1375596-1-christian.couder@gmail.com>
682
683
684
* sj/string-list-typefix (2025-05-18) 8 commits
@@ -667,3 +713,16 @@ Release tarballs are available at:
713
714
Ready?
715
source: <cover.1750717921.git.me@ttaylorr.com>
716
+
717
+--------------------------------------------------
718
+[Discarded]
719
+
720
+* kn/fetch-push-bulk-ref-update-fixup (2025-06-20) 7 commits
721
+ . receive-pack: handle reference deletions separately
722
+ . refs/files: skip updates with errors in batched updates
723
+ . Merge branch 'kn/fetch-push-bulk-ref-update' into kn/fetch-push-bulk-ref-update-fixup
724
+
725
+ Follow-up fixes to the base topic.
726
+
727
+ Superseded--folded into the base topic.
728
+ source: <20250620-6769-address-test-failures-in-the-next-branch-caused-by-batched-reference-updates-v5-0-f35ee6b59a82@gmail.com>