What's cooking (2025/06 #01)
Junio C Hamano committed
Jun 5, 2025 at 15:02 UTC
e529196b0f1c1380c0658bab69f21faba62139f8
1 file changed
+377
-261
whats-cooking.txt
+377
-261
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2025, #09; Fri, 30)
3
-X-master-at: 7014b55638da979331baf8dc31c4e1d697cf2d67
4
-X-next-at: 25b025f5533041e41be3b1d0c15ed2648f01fce5
2
+Subject: What's cooking in git.git (Jun 2025, #01; Thu, 5)
3
+X-master-at: 14de3eb34435db79c6e7edc8082c302a26a8330a
4
+X-next-at: fc6ec28a5d7844ff134d388edf5eb272d1cf11e9
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (May 2025, #09; Fri, 30)
7
+What's cooking in git.git (Jun 2025, #01; Thu, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,204 +48,364 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* am/sparse-index-name-hash-fix (2025-05-21) 1 commit
52
- (merged to 'next' on 2025-05-27 at 63076a2233)
53
- + name-hash: don't add sparse directories in threaded lazy init
51
+* bs/config-mak-openbsd (2025-06-01) 1 commit
52
+ (merged to 'next' on 2025-06-03 at a577e2761d)
53
+ + config.mak.uname: update settings for OpenBSD
54
55
- Avoid adding directory path to a sparse-index tree entries to the
56
- name-hash, since they would bloat the hashtable without anybody
57
- querying for them. This was done already for a single threaded
58
- part of the code, but now the multi-threaded code also does the
59
- same.
60
-
61
- source: <pull.1970.v3.git.git.1747862971672.gitgitgadget@gmail.com>
55
+ Build fix for OpenBSD
56
+ source: <aD0XIxPRQjA5t8oi@humpty.home.comstyle.com>
57
58
64
-* cb/reftable-unused-portability-fix (2025-05-29) 1 commit
65
- - reftable: make REFTABLE_UNUSED C99 compatible
59
+* bs/online-cpus-bsd (2025-06-01) 1 commit
60
+ (merged to 'next' on 2025-06-02 at a9f28d85b6)
61
+ + thread-utils.c: detect online CPU count on OpenBSD / NetBSD
62
67
- Build fix.
63
+ Update online_cpus() functrion on BSD variants.
64
+ source: <aB2c-W0V83aVDpZr@humpty.home.comstyle.com>
65
69
- Will merge to 'next'?
70
- source: <20250529101136.16219-1-carenas@gmail.com>
66
67
+* bs/total-ram-bsd (2025-06-01) 1 commit
68
+ (merged to 'next' on 2025-06-02 at e644b57520)
69
+ + builtin/gc: correct physical memory detection for OpenBSD / NetBSD
70
73
-* jt/receive-pack-skip-connectivity-check (2025-05-20) 2 commits
74
- (merged to 'next' on 2025-05-22 at 3ced8c5d65)
75
- + builtin/receive-pack: add option to skip connectivity check
76
- + t5410: test receive-pack connectivity check
71
+ Update total_ram() functrion on BSD variants.
72
+ source: <aDwOLPOa8JOgFJZg@humpty.home.comstyle.com>
73
78
- "git receive-pack" optionally learns not to care about connectivity
79
- check, which can be useful when the repository arranges to ensure
80
- connectivity by some other means.
81
- source: <20250520163218.263921-1-jltobler@gmail.com>
74
75
+* ja/doc-synopsis-style (2025-05-27) 9 commits
76
+ (merged to 'next' on 2025-06-01 at 8f6b14e592)
77
+ + doc: convert git-switch manpage to new synopsis style
78
+ + doc: convert git-mergetool options to new synopsis style
79
+ + doc: convert git-mergetool manpage to new synopsis style
80
+ + doc: switch merge config description to new synopsis format
81
+ + doc: convert merge strategies to synopsis format
82
+ + doc: merge-options.adoc remove a misleading double negation
83
+ + doc: convert merge options to new synopsis format
84
+ + doc: convert git-merge manpage to new style
85
+ + doc: convert git-checkout manpage to new style
86
84
-* kh/notes-doc-fixes (2025-05-27) 9 commits
85
- (merged to 'next' on 2025-05-29 at 29c8f36bb2)
86
- + doc: notes: use stuck form throughout
87
- + doc: notes: treat --stdin equally between copy/remove
88
- + doc: notes: point out copy --stdin use with argv
89
- + doc: notes: clearly state that --stripspace is the default
90
- + doc: notes: remove stripspace discussion from other options
91
- + doc: notes: rework --[no-]stripspace
92
- + doc: notes: split out options with negated forms
93
- + doc: config: mention core.commentChar on commit.cleanup
94
- + doc: stripspace: mention where the default comes from
87
+ Doc mark-up fixes.
88
+ source: <pull.1927.git.1748204829.gitgitgadget@gmail.com>
89
96
- "git notes --help" documentation updates.
97
-
98
- source: <cover.1748380390.git.code@khaugsbakk.name>
90
91
+* jc/signed-fast-export-is-experimental (2025-05-28) 1 commit
92
+ (merged to 'next' on 2025-06-01 at 54d15b067c)
93
+ + fast-export: --signed-commits is experimental
94
101
-* kn/passing-leak-tests (2025-05-20) 1 commit
102
- (merged to 'next' on 2025-05-22 at bc0d708c5c)
103
- + t: remove unexpected SANITIZE_LEAK variables
95
+ Mark a new feature added during this cycle as experimental and fix
96
+ its default so that existing users of the fast-export command is
97
+ not broken.
98
+ cf. <xmqqzfeyqdye.fsf@gitster.g>
99
+ source: <xmqq8qmgsky8.fsf@gitster.g>
100
105
- Remove the leftover hints to the test framework to mark tests that
106
- do not pass the leak checker tests, as they should no longer be
107
- needed.
108
- source: <20250520-kn-remove-unexpected-exported-v1-1-bb60cec57e84@gmail.com>
101
102
+* kh/doc-column-markup-fix (2025-06-01) 1 commit
103
+ (merged to 'next' on 2025-06-02 at 96a755b8d2)
104
+ + doc: column: fix blank lines around block delimiters
105
111
-* mm/apply-reverse-mode-of-deleted-path (2025-05-27) 2 commits
112
- (merged to 'next' on 2025-05-29 at 8253df36c6)
113
- + apply: set file mode when --reverse creates a deleted file
114
- + t4129: test that git apply warns for unexpected mode changes
106
+ Doc updates.
107
+ source: <3c6d7b154048ef0053d15b4f86cc241211ef30dc.1748777208.git.code@khaugsbakk.name>
108
116
- "git apply --index/--cached" when applying a deletion patch in
117
- reverse failed to give the mode bits of the path "removed" by the
118
- patch to the file it creates, which has been corrected.
119
-
120
- source: <20250524034046.2619-1-mark@chromium.org>
109
110
+* sj/ref-contents-check-fix (2025-06-02) 1 commit
111
+ (merged to 'next' on 2025-06-02 at 6a9b2f5e9d)
112
+ + fsck: ignore missing "refs" directory for linked worktrees
113
123
-* op/cvsserver-perl-warning (2025-05-27) 1 commit
124
- (merged to 'next' on 2025-05-29 at 9916ee1663)
125
- + cvsserver: remove unused escapeRefName function
114
+ "git verify-refs" (and hence "git fsck --reference") started
115
+ erroring out in a repository in which secondary worktrees were
116
+ prepared with Git 2.43 or lower.
117
+ source: <aD24H3nVTwTq8JDq@ArchLinux>
118
127
- Recent versions of Perl started warning against "! A =~ /pattern/"
128
- which does not negate the result of the matching. As it turns out
129
- that the problematic function is not even called, it was removed.
130
-
131
- source: <pull.1925.v4.git.1748267305871.gitgitgadget@gmail.com>
119
120
+* wk/sparse-checkout-doc-fix (2025-05-30) 1 commit
121
+ (merged to 'next' on 2025-06-01 at 846fc57c9e)
122
+ + doc: sparse-checkout: use consistent inline list style
123
134
-* ps/midx-negative-packfile-cache (2025-05-28) 2 commits
135
- (merged to 'next' on 2025-05-29 at 1d8aa44642)
136
- + midx: stop repeatedly looking up nonexistent packfiles
137
- + packfile: explain ordering of how we look up auxiliary pack files
138
- (this branch is used by tb/prepare-midx-pack-cleanup.)
124
+ Doc update.
125
+ source: <pull.1948.v2.git.git.1748589756289.gitgitgadget@gmail.com>
126
140
- When a stale .midx file refers to .pack files that no longer exist,
141
- we ended up checking for these non-existent files repeatedly, which
142
- has been optimized by memoizing the non-existence.
143
-
144
- source: <20250528-pks-pack-avoid-stats-on-missing-v3-0-4cbd0e14bed8@pks.im>
127
+--------------------------------------------------
128
+[New Topics]
129
130
+* mm/test-in-absolute-home (2025-05-30) 1 commit
131
+ (merged to 'next' on 2025-06-05 at ae6cc48f8d)
132
+ + t: run tests from a normalized working directory
133
147
-* pw/midx-repack-overflow-fix (2025-05-22) 4 commits
148
- (merged to 'next' on 2025-05-27 at 52646da108)
149
- + midx docs: clarify tie breaking
150
- + midx: avoid negative array index
151
- + midx repack: avoid potential integer overflow on 64 bit systems
152
- + midx repack: avoid integer overflow on 32 bit systems
134
+ Tests that compare $HOME and $(pwd), which should be the same
135
+ directory unless the tests chdir's around, would fail when the user
136
+ enters the test directory via symbolic links, which has been
137
+ corrected.
138
154
- Integer overflow fix around code paths for "git multi-pack-index repack"..
155
- cf. <aC/C9oQrcx/RiyP1@nand.local>
156
- source: <cover.1747929225.git.phillip.wood@dunelm.org.uk>
139
+ Will cook in 'next'.
140
+ cf. <xmqq4iwwk7mc.fsf@gitster.g>
141
+ source: <20250528201737.55268-1-mark@chromium.org>
142
158
---------------------------------------------------
159
-[New Topics]
143
161
-* ag/send-email-edit-threading-fix (2025-05-29) 2 commits
162
- - send-email: show the new message id assigned by outlook in the logs
163
- - send-email: fix bug resulting in broken threads if a message is edited
144
+* ag/imap-send-resurrection (2025-06-05) 10 commits
145
+ - imap-send: add ability to list the available folders
146
+ - imap-send: display the destination mailbox when sending a message
147
+ - imap-send: display port alongwith host when git credential is invoked
148
+ - imap-send: fix minor mistakes in the logs
149
+ - imap-send: enable specifying the folder using the command line
150
+ - imap-send: gracefully fail if CRAM-MD5 authentication is requested without OpenSSL
151
+ - imap-send: fix memory leak in case auth_cram_md5 fails
152
+ - imap-send: add PLAIN authentication method to OpenSSL
153
+ - imap-send: add support for OAuth2.0 authentication
154
+ - imap-send: fix bug causing cfg->folder being set to NULL
155
+
156
+ "git imap-send" has been broken for a long time, which has been
157
+ resurrected and then taught to talk OAuth2.0 etc.
158
+
159
+ Comments?
160
+ source: <cover.1749112640.git.gargaditya08@live.com>
161
+
162
+
163
+* ag/send-email-docs (2025-05-30) 4 commits
164
+ (merged to 'next' on 2025-06-05 at d6b5e97d89)
165
+ + docs: make the purpose of using app password for Gmail more clear in send-email
166
+ + docs: remove credential helper links for emails from gitcredentials
167
+ + docs: improve formatting in git-send-email documentation
168
+ + docs: add credential helper for yahoo and link Google's sendgmail tool
169
+
170
+ Documentation for "git send-email" has been updated with a bit more
171
+ credential helper and OAuth information.
172
+
173
+ Will cook in 'next'.
174
+ source: <20250530154934.10077-1-gargaditya08@live.com>
175
+
176
+
177
+* ly/pack-bitmap-root-leakfix (2025-06-05) 1 commit
178
+ - pack-bitmap: remove checks before bitmap_free
179
+
180
+ Memleak fix on an error code path.
181
+
182
+ Will merge to 'next'.
183
+ source: <pull.1977.v6.git.git.1749138820241.gitgitgadget@gmail.com>
184
+
185
+
186
+* pw/subtree-gpg-sign (2025-06-04) 2 commits
187
+ (merged to 'next' on 2025-06-05 at 5366ac646f)
188
+ + contrib/subtree: add -S/--gpg-sign
189
+ + contrib/subtree: parse using --stuck-long
190
+
191
+ "git subtree" (in contrib/) learns to grok GPG signing its commits.
192
+
193
+ Will cook in 'next'.
194
+ source: <pull.1928.v2.git.1749046597.gitgitgadget@gmail.com>
195
+
196
+
197
+* sk/reftable-clarify-tests (2025-06-05) 10 commits
198
+ - t/unit-tests: finalize migration of reftable-related tests
199
+ - t/unit-tests: convert reftable stack test to use clar
200
+ - t/unit-tests: convert reftable record test to use clar
201
+ - t/unit-tests: convert reftable readwrite test to use clar
202
+ - t/unit-tests: convert reftable table test to use clar
203
+ - t/unit-tests: convert reftable pq test to use clar
204
+ - t/unit-tests: convert reftable merged test to use clar
205
+ - t/unit-tests: convert reftable block test to use clar
206
+ - t/unit-tests: convert reftable basics test to use clar test framework
207
+ - t/unit-tests: implement clar specific reftable test helper functions
208
+
209
+ The reftable unit tests are now ported to the "clar" unit testing
210
+ framework.
211
+
212
+ Expecting a reroll.
213
+ cf. <xmqqikla86id.fsf@gitster.g>
214
+ source: <20250605140644.239199-1-kuforiji98@gmail.com>
215
165
- "git send-email" incremented its internal message counter when a
166
- message was edited, which made logic that treats the first message
167
- specially misbehave, which has been corrected.
216
+
217
+* cf/var-completion-obsd-fixes (2025-06-02) 1 commit
218
+ (merged to 'next' on 2025-06-05 at 0e07c5bcf4)
219
+ + completion: make sed command that generates config-list.h portable.
220
+
221
+ Build fix for OpenBSD.
222
+
223
+ Will merge to 'master'.
224
+ source: <59b2a12a3f43cf078fbeaf0271b5a7cfffc9eb8f.1748903426.git.collin.funk1@gmail.com>
225
+
226
+
227
+* lo/my-first-ow-doc-update (2025-06-02) 2 commits
228
+ (merged to 'next' on 2025-06-05 at 576594dbf9)
229
+ + MyFirstContribution: add walken.c to meson.build
230
+ + MyFirstContribution: use struct repository in examples
231
+
232
+ Doc update to the more recent world order.
233
+
234
+ Will cook in 'next'.
235
+ source: <20250602205021.4223-1-lucasseikioshiro@gmail.com>
236
+
237
+
238
+* vd/cat-file-objectmode-update (2025-06-03) 3 commits
239
+ (merged to 'next' on 2025-06-05 at fb997e495f)
240
+ + cat-file.c: add batch handling for submodules
241
+ + cat-file: add %(objectmode) atom
242
+ + t1006: update 'run_tests' to test generic object specifiers
243
+
244
+ "git cat-file --batch" learns to understand %(objectmode) atom to
245
+ allow the caller to tell missing objects (due to repository
246
+ corruption) and submodules (whose commit objects are OK to be
247
+ missing) apart.
248
+
249
+ Will cook in 'next'.
250
+ source: <pull.1929.git.1748890555.gitgitgadget@gmail.com>
251
+
252
+
253
+* bs/bsd-wo-specific-xopen-source (2025-06-03) 1 commit
254
+ (merged to 'next' on 2025-06-05 at ce6964f985)
255
+ + compat: fixes for header handling with OpenBSD / NetBSD
256
+
257
+ Build fix for BSDs.
258
+
259
+ Will merge to 'master'.
260
+ source: <aD1SvlRypkhczxRS@humpty.home.comstyle.com>
261
+
262
+
263
+* ly/do-not-localize-bug-messages (2025-06-03) 1 commit
264
+ (merged to 'next' on 2025-06-05 at 8fb8d5c0bb)
265
+ + BUG(): remove leading underscore of the format string
266
+
267
+ Code clean-up.
268
+
269
+ Will cook in 'next'.
270
+ source: <9d69c19273be31135eade258b49582bcc6df27c7.1748916074.git.gitgitgadget@gmail.com>
271
+
272
+
273
+* ly/sequencer-update-squash-is-fixup-only (2025-06-03) 1 commit
274
+ (merged to 'next' on 2025-06-05 at 0ac9201fee)
275
+ + sequencer: replace error() with BUG() in update_squash_messages ()
276
+
277
+ Code clean-up.
278
+
279
+ Will cook in 'next'.
280
+ source: <f2d2cfd6a876daa6019cd82aa6bf1309f29fea83.1748916074.git.gitgitgadget@gmail.com>
281
+
282
+
283
+* cf/guideline-documenting-config-vars (2025-06-03) 1 commit
284
+ - CodingGuidelines: document formatting of similar config variables.
285
+
286
+ CodingGuidelines update.
287
+
288
+ Will merge to 'next'.
289
+ source: <802402a288f0976765f1ba1c82d14c2289c8cf72.1748990700.git.collin.funk1@gmail.com>
290
+
291
+
292
+* jk/curl-easy-setopt-typefix (2025-06-04) 3 commits
293
+ - curl: fix symbolic constant typechecks with curl_easy_setopt()
294
+ - curl: fix integer variable typechecks with curl_easy_setopt()
295
+ - curl: fix integer constant typechecks with curl_easy_setopt()
296
+ (this branch is used by js/curl-easy-setopt-typefix.)
297
+
298
+ Adjust to newer version of libcURL.
299
+
300
+ Will merge to 'next'.
301
+ source: <20250604205505.GA1510724@coredump.intra.peff.net>
302
+
303
+
304
+* jm/bundle-uri-debug-output-to-fp (2025-06-04) 1 commit
305
+ - bundle-uri: send debug output to given FILE * stream
306
+
307
+ Code clean-up.
308
309
Will merge to 'next'?
170
- source: <cover.1748529954.git.gargaditya08@live.com>
310
+ source: <pull.1985.v2.git.git.1749057081918.gitgitgadget@gmail.com>
311
312
173
-* jc/signed-fast-export-is-experimental (2025-05-28) 1 commit
174
- - fast-export: --signed-commits is experimental
313
+* ly/commit-graph-graph-write-leakfix (2025-06-04) 1 commit
314
+ (merged to 'next' on 2025-06-05 at ae03e27cc8)
315
+ + commit-graph: fix start_delayed_progress() leak
316
176
- source: <xmqq8qmgsky8.fsf@gitster.g>
317
+ A memory-leak in an error code path has been plugged.
318
319
+ Will cook in 'next'.
320
+ source: <pull.1986.git.git.1749006675784.gitgitgadget@gmail.com>
321
179
-* ly/load-bitmap-leakfix (2025-05-29) 2 commits
180
- - pack-bitmap: add load corrupt bitmap test
181
- - pack-bitmap: fix memory leak if load_bitmap() failed
322
183
- Leakfix with a new and a bit invasive test.
323
+* ly/fetch-pack-leakfix (2025-06-04) 1 commit
324
+ (merged to 'next' on 2025-06-05 at 560cfcbe51)
325
+ + builtin/fetch-pack: cleanup before return error
326
185
- Comments?
186
- source: <pull.1962.v4.git.git.1748140983.gitgitgadget@gmail.com>
327
+ A memory-leak in an error code path has been plugged.
328
329
+ Will cook in 'next'.
330
+ source: <pull.1990.git.git.1749006474694.gitgitgadget@gmail.com>
331
189
-* ag/send-email-docs (2025-05-30) 4 commits
190
- - docs: make the purpose of using app password for Gmail more clear in send-email
191
- - docs: remove credential helper links for emails from gitcredentials
192
- - docs: improve formatting in git-send-email documentation
193
- - docs: add credential helper for yahoo and link Google's sendgmail tool
332
195
- source: <20250530154934.10077-1-gargaditya08@live.com>
333
+* js/curl-easy-setopt-typefix (2025-06-05) 2 commits
334
+ - curl: pass `long` values where expected
335
+ - Merge branch 'jk/curl-easy-setopt-typefix' into js/curl-easy-setopt-typefix
336
+ (this branch uses jk/curl-easy-setopt-typefix.)
337
338
+ Adjust to newer version of libcURL.
339
198
-* rc/userdiff-r (2025-05-29) 1 commit
199
- - userdiff: add support for R programming language
340
+ Will merge to 'next'.
341
+ source: <xmqqh60u9nuo.fsf@gitster.g>
342
201
- source: <20250529221805.97036-1-rodrigorsdc@gmail.com>
343
344
+* ly/commit-buffer-reencode-leakfix (2025-06-05) 1 commit
345
+ - repo_logmsg_reencode: fix memory leak when use repo_logmsg_reencode ()
346
204
-* wk/sparse-checkout-doc-fix (2025-05-30) 1 commit
205
- - doc: sparse-checkout: use consistent inline list style
347
+ Leakfix.
348
207
- source: <pull.1948.v2.git.git.1748589756289.gitgitgadget@gmail.com>
349
+ Will merge to 'next'.
350
+ source: <pull.1988.v2.git.git.1749104846531.gitgitgadget@gmail.com>
351
352
--------------------------------------------------
353
[Cooking]
354
212
-* ja/doc-synopsis-style (2025-05-27) 9 commits
213
- - doc: convert git-switch manpage to new synopsis style
214
- - doc: convert git-mergetool options to new synopsis style
215
- - doc: convert git-mergetool manpage to new synopsis style
216
- - doc: switch merge config description to new synopsis format
217
- - doc: convert merge strategies to synopsis format
218
- - doc: merge-options.adoc remove a misleading double negation
219
- - doc: convert merge options to new synopsis format
220
- - doc: convert git-merge manpage to new style
221
- - doc: convert git-checkout manpage to new style
355
+* ag/send-email-edit-threading-fix (2025-06-04) 2 commits
356
+ - send-email: show the new message id assigned by outlook in the logs
357
+ - send-email: fix bug resulting in broken threads if a message is edited
358
223
- Doc mark-up fixes.
359
+ "git send-email" incremented its internal message counter when a
360
+ message was edited, which made logic that treats the first message
361
+ specially misbehave, which has been corrected.
362
363
Will merge to 'next'?
226
- source: <pull.1927.git.1748204829.gitgitgadget@gmail.com>
364
+ source: <PN3PR01MB95979AA8114CA26405BE02CFB86CA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
365
366
229
-* ps/maintenance-ref-lock (2025-05-30) 12 commits
230
- - builtin/maintenance: fix locking race when handling "gc" task
231
- - builtin/gc: avoid global state in `gc_before_repack()`
232
- - usage: allow dying without writing an error message
233
- - builtin/maintenance: fix locking race when packing refs and reflogs
234
- - builtin/maintenance: let tasks do maintenance before and after detach
235
- - builtin/maintenance: fix typedef for function pointers
236
- - builtin/maintenance: extract function to run tasks
237
- - builtin/maintenance: stop modifying global array of tasks
238
- - builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
239
- - builtin/maintenance: centralize configuration of explicit tasks
240
- - builtin/gc: drop redundant local variable
241
- - builtin/gc: use designated field initializers for maintenance tasks
367
+* ly/load-bitmap-leakfix (2025-06-03) 3 commits
368
+ - pack-bitmap: add load corrupt bitmap test
369
+ - pack-bitmap: reword comments in test_bitmap_commits()
370
+ - pack-bitmap: fix memory leak if load_bitmap() failed
371
+
372
+ Leakfix with a new and a bit invasive test.
373
+
374
+ Comments?
375
+ source: <pull.1962.v5.git.git.1748920444.gitgitgadget@gmail.com>
376
+
377
+
378
+* rc/userdiff-r (2025-05-29) 1 commit
379
+ (merged to 'next' on 2025-06-05 at 28e008821c)
380
+ + userdiff: add support for R programming language
381
+
382
+ Userdiff patterns for the R language.
383
+
384
+ Will cook in 'next'.
385
+ source: <20250529221805.97036-1-rodrigorsdc@gmail.com>
386
+
387
+
388
+* ps/maintenance-ref-lock (2025-06-03) 12 commits
389
+ (merged to 'next' on 2025-06-05 at 9790bf814f)
390
+ + builtin/maintenance: fix locking race when handling "gc" task
391
+ + builtin/gc: avoid global state in `gc_before_repack()`
392
+ + usage: allow dying without writing an error message
393
+ + builtin/maintenance: fix locking race with refs and reflogs tasks
394
+ + builtin/maintenance: split into foreground and background tasks
395
+ + builtin/maintenance: fix typedef for function pointers
396
+ + builtin/maintenance: extract function to run tasks
397
+ + builtin/maintenance: stop modifying global array of tasks
398
+ + builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
399
+ + builtin/maintenance: centralize configuration of explicit tasks
400
+ + builtin/gc: drop redundant local variable
401
+ + builtin/gc: use designated field initializers for maintenance tasks
402
403
"git maintenance" lacked the care "git gc" had to avoid holding
404
onto the repository lock for too long during packing refs, which
405
has been remedied.
406
247
- Comments?
248
- source: <20250530-b4-pks-maintenance-ref-lock-race-v2-0-d04e2f93e51f@pks.im>
407
+ Will cook in 'next'.
408
+ source: <20250603-b4-pks-maintenance-ref-lock-race-v4-0-52f5cf7b7e99@pks.im>
409
410
411
* tb/prepare-midx-pack-cleanup (2025-05-29) 5 commits
@@ -257,27 +417,29 @@ Release tarballs are available at:
417
418
Improvement on Multi-pack-index API.
419
260
- Comments?
420
+ Expecting a reroll?
421
+ cf. <20250530065034.GC1321283@coredump.intra.peff.net>
422
source: <cover.1748473122.git.me@ttaylorr.com>
423
424
264
-* ps/meson-tap-parse (2025-05-30) 10 commits
265
- - meson: parse TAP output generated by our tests
266
- - meson: introduce kwargs variable for tests
267
- - test-lib: fail on unexpectedly passing tests
268
- - t7815: fix unexpectedly passing test on macOS
269
- - t/test-lib: fix TAP format for BASH_XTRACEFD warning
270
- - t/test-lib: don't print shell traces to stdout
271
- - t983*: use prereq to check for Python-specific git-b4(1) support
272
- - t9822: use prereq to check for ISO-8859-1 support
273
- - t: silence output from `test_create_repo()`
274
- - t: stop announcing prereqs
425
+* ps/meson-tap-parse (2025-06-02) 10 commits
426
+ (merged to 'next' on 2025-06-03 at 579d19e8ae)
427
+ + meson: parse TAP output generated by our tests
428
+ + meson: introduce kwargs variable for tests
429
+ + test-lib: fail on unexpectedly passing tests
430
+ + t7815: fix unexpectedly passing test on macOS
431
+ + t/test-lib: fix TAP format for BASH_XTRACEFD warning
432
+ + t/test-lib: don't print shell traces to stdout
433
+ + t983*: use prereq to check for Python-specific git-p4(1) support
434
+ + t9822: use prereq to check for ISO-8859-1 support
435
+ + t: silence output from `test_create_repo()`
436
+ + t: stop announcing prereqs
437
438
Meson-based build/test framework now understands TAP output
439
generated by our tests.
440
279
- Will merge to 'next'?
280
- source: <20250530-pks-meson-tap-v3-0-676f5e41f2e4@pks.im>
441
+ Will cook in 'next'.
442
+ source: <20250602-pks-meson-tap-v4-0-052dfde0818a@pks.im>
443
444
445
* jw/doc-txt-to-adoc-refs (2025-05-21) 2 commits
@@ -288,43 +450,31 @@ Release tarballs are available at:
450
longer exist, due to recent ".txt" -> ".adoc" renaming, have been
451
corrected.
452
291
- Waiting for review response.
453
+ Will squash in the fix-up and merge to 'next'.
454
source: <pull.1971.git.git.1747854310479.gitgitgadget@gmail.com>
455
456
457
* jk/diff-no-index-with-pathspec (2025-05-22) 3 commits
296
- - diff --no-index: support limiting by pathspec
297
- - pathspec: add flag to indicate operation without repository
298
- - pathspec: add match_leading_pathspec variant
458
+ (merged to 'next' on 2025-06-05 at b0dee92a43)
459
+ + diff --no-index: support limiting by pathspec
460
+ + pathspec: add flag to indicate operation without repository
461
+ + pathspec: add match_leading_pathspec variant
462
463
"git diff --no-index dirA dirB" can limit the comparison with
464
pathspec at the end of the command line, just like normal "git
465
diff".
466
304
- Comments?
467
+ Will cook in 'next'.
468
source: <20250521232917.2333291-1-jacob.e.keller@intel.com>
469
470
308
-* ag/doc-send-email-update-2 (2025-05-30) 4 commits
309
- - docs: make the purpose of using app password for Gmail more clear in send-email
310
- - docs: remove credential helper links for emails from gitcredentials
311
- - docs: improve formatting in git-send-email documentation
312
- - docs: add credential helper for yahoo and link Google's sendgmail tool
313
-
314
- Documentation for "git send-email" has been updated with a bit more
315
- credential helper and OAuth information.
316
-
317
- Will merge to 'next'?
318
- source: <20250530154934.10077-1-gargaditya08@live.com>
319
-
320
-
471
* pw/stash-p-pathspec-fixes (2025-05-20) 2 commits
472
- stash: allow "git stash [<options>] --patch <pathspec>" to assume push
473
- stash: allow "git stash -p <pathspec>" to assume push again
474
475
"git stash -p <pathspec>" improvements.
476
327
- Comments?
477
+ Will merge to 'next'?
478
source: <cover.1747733203.git.phillip.wood@dunelm.org.uk>
479
480
@@ -360,7 +510,7 @@ Release tarballs are available at:
510
511
Assorted changes that please CodeQL.
512
363
- Comments?
513
+ Will discard, as no strong support seems to be there in the thread.
514
source: <pull.1890.git.1747313139.gitgitgadget@gmail.com>
515
516
@@ -382,23 +532,22 @@ Release tarballs are available at:
532
Update bitrotten instruction for sending patches via Thunderbird
533
(in contrib/).
534
385
- Comments?
535
+ Will discard, as it was let be bitrotten without bothering any users.
536
source: <20250516135540.218937-1-phillip.wood123@gmail.com>
537
538
389
-* bc/stash-export-import (2025-05-22) 5 commits
539
+* bc/stash-export-import (2025-06-01) 4 commits
540
- builtin/stash: provide a way to import stashes from a ref
541
- builtin/stash: provide a way to export stashes to a ref
542
- builtin/stash: factor out revision parsing into a function
393
- - reflog-walk: expose read_complete_reflog
543
- object-name: make get_oid quietly return an error
544
545
An interchange format for stash entries is defined, and subcommand
546
of "git stash" to import/export has been added.
547
399
- Expecting a v7.
400
- cf. <aDTJHGmCnvdFkswt@tapette.crustytoothpaste.net>
401
- source: <20250522185524.18398-1-sandals@crustytoothpaste.net>
548
+ Expecting a (hopefully small and final) reroll.
549
+ cf. <127d9d03-e94e-4928-9c6d-07a5396ca325@gmail.com>
550
+ source: <20250601223225.464076-1-sandals@crustytoothpaste.net>
551
552
553
* lm/add-p-context (2025-05-12) 4 commits
@@ -410,7 +559,8 @@ Release tarballs are available at:
559
"git add/etc -p" now honors diff.context configuration variable,
560
and learns to honor -U<n> option.
561
413
- Comments?
562
+ Expecting a reroll.
563
+ cf. <CAP9jKjEYgEBBGrPnJ8fkaWuS8RPzBeBqFLE7aTJd5x9PcWu=7Q@mail.gmail.com>
564
source: <pull.1915.v2.git.1746884789.gitgitgadget@gmail.com>
565
566
@@ -434,15 +584,15 @@ Release tarballs are available at:
584
source: <20250512-pks-contrib-spring-cleanup-v3-0-32e151b0bfb0@pks.im>
585
586
437
-* ps/object-store (2025-05-14) 18 commits
587
+* ps/object-store (2025-06-05) 17 commits
588
- odb: rename `read_object_with_reference()`
589
- odb: rename `pretend_object_file()`
590
- odb: rename `has_object()`
591
- odb: rename `repo_read_object_file()`
592
- odb: rename `oid_object_info()`
593
- odb: trivial refactorings to get rid of `the_repository`
444
- - odb: get rid of `the_repository` when handling submodule alternates
445
- - odb: get rid of `the_repository` when handling the primary alternate
594
+ - odb: get rid of `the_repository` when handling submodule sources
595
+ - odb: get rid of `the_repository` when handling the primary source
596
- odb: get rid of `the_repository` in `for_each()` functions
597
- odb: get rid of `the_repository` when handling alternates
598
- odb: get rid of `the_repository` in `odb_mkstemp()`
@@ -450,14 +600,13 @@ Release tarballs are available at:
600
- odb: get rid of `the_repository` in `find_odb()`
601
- odb: introduce parent pointers
602
- object-store: rename files to "odb.{c,h}"
453
- - object-store: rename `object_directory` to `odb_alternate`
603
+ - object-store: rename `object_directory` to `odb_source`
604
- object-store: rename `raw_object_store` to `object_database`
455
- - Merge branch 'ps/object-store-cleanup' into ps/object-store
605
606
Code clean-up around object access API.
607
608
Comments?
460
- source: <20250514-pks-object-store-wo-the-repository-v3-0-47df1d4ead22@pks.im>
609
+ source: <20250605-pks-object-store-wo-the-repository-v5-0-779d1c28774b@pks.im>
610
611
612
* cc/promisor-remote-capability (2025-05-19) 5 commits
@@ -467,7 +616,12 @@ Release tarballs are available at:
616
- promisor-remote: allow a server to advertise more fields
617
- promisor-remote: refactor to get rid of 'struct strvec'
618
470
- Comments?
619
+ The "promisor-remote" capability mechanism has been updated to
620
+ allow the "partialCloneFilter" settings and the "token" value to be
621
+ communicated from the server side.
622
+
623
+ Expecting a reroll.
624
+ cf. <aDVu6O9MUicmd8y4@pks.im>
625
source: <20250519141259.3061550-1-christian.couder@gmail.com>
626
627
@@ -500,18 +654,20 @@ Release tarballs are available at:
654
source: <20250424203904.909777-1-christian.couder@gmail.com>
655
656
503
-* sj/string-list-typefix (2025-04-22) 5 commits
657
+* sj/string-list-typefix (2025-06-03) 8 commits
658
- u-string-list: move "remove duplicates" test to "u-string-list.c"
659
- u-string-list: move "filter string" test to "u-string-list.c"
660
- u-string-list: move "test_split_in_place" to "u-string-list.c"
661
- u-string-list: move "test_split" into "u-string-list.c"
508
- - string-list: fix sign compare warnings
662
+ - string-list: enable sign compare warnings check
663
+ - string-list: return index directly when inserting an existing element
664
+ - string-list: remove unused "insert_at" parameter from add_entry
665
+ - string-list: fix sign compare warnings for loop iterator
666
667
Code and test clean-up around string-list API.
668
512
- Expecting a reroll.
513
- cf. <aA8vSPKdznjzBf6W@pks.im>
514
- source: <aAetW0dan8S3Fljq@ArchLinux>
669
+ Comments?
670
+ source: <aCoDB9P5XV1lHMil@ArchLinux>
671
672
673
* tb/midx-avoid-cruft-packs (2025-05-29) 9 commits
@@ -532,83 +688,43 @@ Release tarballs are available at:
688
source: <cover.1748473889.git.me@ttaylorr.com>
689
690
535
-* pb/status-rebase-fixes (2025-03-28) 4 commits
536
- - wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
537
- - wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
538
- - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
539
- - rebase -r: do create merge commit after empty resolution
540
-
541
- A few fixes around "git status" while "git rebase" is running,
542
- plus a corner case bug fix for "git rebase -r".
543
-
544
- Expecting a (small and hopefully final) clarifying reroll.
545
- cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>
546
- cf. <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>
547
- source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>
548
-
549
-
691
* ds/path-walk-2 (2025-05-16) 13 commits
551
- - pack-objects: allow --shallow and --path-walk
552
- - path-walk: add new 'edge_aggressive' option
553
- - pack-objects: thread the path-based compression
554
- - pack-objects: refactor path-walk delta phase
555
- - scalar: enable path-walk during push via config
556
- - pack-objects: enable --path-walk via config
557
- - repack: add --path-walk option
558
- - t5538: add tests to confirm deltas in shallow pushes
559
- - pack-objects: introduce GIT_TEST_PACK_PATH_WALK
560
- - p5313: add performance tests for --path-walk
561
- - pack-objects: update usage to match docs
562
- - pack-objects: add --path-walk option
563
- - pack-objects: extract should_attempt_deltas()
692
+ (merged to 'next' on 2025-06-05 at e59d4b1701)
693
+ + pack-objects: allow --shallow and --path-walk
694
+ + path-walk: add new 'edge_aggressive' option
695
+ + pack-objects: thread the path-based compression
696
+ + pack-objects: refactor path-walk delta phase
697
+ + scalar: enable path-walk during push via config
698
+ + pack-objects: enable --path-walk via config
699
+ + repack: add --path-walk option
700
+ + t5538: add tests to confirm deltas in shallow pushes
701
+ + pack-objects: introduce GIT_TEST_PACK_PATH_WALK
702
+ + p5313: add performance tests for --path-walk
703
+ + pack-objects: update usage to match docs
704
+ + pack-objects: add --path-walk option
705
+ + pack-objects: extract should_attempt_deltas()
706
707
"git pack-objects" learns to find delta bases from blobs at the
708
same path, using the --path-walk API.
709
568
- Comments?
710
+ Will cook in 'next'.
711
source: <pull.1819.v3.git.1747419124.gitgitgadget@gmail.com>
712
713
--------------------------------------------------
714
[Discarded]
715
574
-* tb/pack-bitmap-lookup-tables (2025-04-17) 4 commits
575
- . t/perf/lib-bitmap.sh: avoid test_perf during setup
576
- . t/perf: avoid testing bitmaps without lookup table
577
- . p5312: removed duplicate performance test script
578
- . pack-bitmap: write lookup table extension by default
716
+* pb/status-rebase-fixes (2025-03-28) 4 commits
717
+ - wt-status: suggest 'git rebase --continue' to conclude 'merge' instruction
718
+ - wt-status: also abbreviate 'merge' and 'fixup -C' lines during rebase
719
+ - SQUASH??? - <CAPig+cS92W_gYuNsaTvQxiP3xBK7Wpg0__uVkgAU1x0OFJUZgQ@mail.gmail.com>
720
+ - rebase -r: do create merge commit after empty resolution
721
580
- Enable lookup tables extension in pack bitmap (and midx bitmap) by
581
- default.
722
+ A few fixes around "git status" while "git rebase" is running,
723
+ plus a corner case bug fix for "git rebase -r".
724
725
Retracted.
584
- cf. <aDZ28C8bqnstJ68r@nand.local>
585
- source: <cover.1744924321.git.me@ttaylorr.com>
586
-
587
-
588
-* ib/diff-S-G-with-longhand (2025-02-12) 10 commits
589
- . diff: docs: Use --patch-{grep,modifies} over -G/-S
590
- . diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}
591
- . diff: test: Use --patch-{grep,modifies} over -G/-S
592
- . completion: Support --patch-{grep,modifies}
593
- . diff: --patch-{grep,modifies} arg names for -G and -S
594
- . docs: gitdiffcore: -G and -S: Use regex/string placeholders
595
- . diff: short help: Add -G and --pickaxe-grep
596
- . diff: short help: Correct -S description
597
- . diff: -G description: Correct copy/paste error
598
- . t/t4209-log-pickaxe: Naming typo: -G takes a regex
599
-
600
- The commands in the "diff" family learned longhands for "-S" and
601
- "-G" options.
602
-
603
- Has been in "Expecting a reroll" state for too long.
604
- source: <20250212032657.1807939-1-illia.bobyr@gmail.com>
605
-
606
-
607
-* ps/pack-check-pack-first (2025-05-16) 1 commit
608
- . packfile: avoid access(3p) calls for missing packs
609
-
610
- The packfile registration code used to check ".pack" file the last
611
- after checking ".keep" and other files; the ordering is reversed.
612
-
613
- Superseded by the ps/midx-negative-packfile-cache topic
614
- source: <20250516-pks-pack-avoid-stats-on-missing-v1-1-e2ef4d8798a3@pks.im>
726
+ cf. <642C61F8-FF74-4012-912F-51D364D1B2F6@gmail.com>
727
+ Expecting a (hopefully small and final) reroll.
728
+ cf. <c2f93d99-2f4d-ee6d-7087-42320c6df0f2@gmx.de>
729
+ cf. <e9700234-324d-dc63-d91e-9b8f36fabc79@gmail.com>
730
+ source: <pull.1897.git.1743181401.gitgitgadget@gmail.com>