What's cooking (2025/09 #05)
Junio C Hamano committed
Sep 12, 2025 at 12:13 UTC
b75947adf8cdf03a9e73822d91e1157ebfc66f81
1 file changed
+241
-180
whats-cooking.txt
+241
-180
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2025, #04; Wed, 10)
3
-X-master-at: 4975ec3473b4bc61bc8a3df1ef29d0b7e7959e87
4
-X-next-at: afdaf0ed07e9cf343775fe4d542e679c90adf6f0
2
+Subject: What's cooking in git.git (Sep 2025, #05; Fri, 12)
3
+X-master-at: 92c87bdc406e5bcf1b516a861d609b03d99c23b7
4
+X-next-at: 07681ecd9b0a321cb12a8cb18dac6580ede927c4
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Sep 2025, #04; Wed, 10)
7
+What's cooking in git.git (Sep 2025, #05; Fri, 12)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -50,36 +50,163 @@ Release tarballs are available at:
50
51
https://www.kernel.org/pub/software/scm/git/
52
53
+--------------------------------------------------
54
+[Graduated to 'master']
55
+
56
+* je/doc-add (2025-08-29) 3 commits
57
+ (merged to 'next' on 2025-09-02 at 6aa32994dd)
58
+ + doc: rephrase the purpose of the staging area
59
+ (merged to 'next' on 2025-08-25 at 0c84501ed2)
60
+ + doc: git-add: simplify discussion of ignored files
61
+ + doc: git-add: clarify intro & add an example
62
+
63
+ Documentation for "git add" has been updated.
64
+ source: <pull.1952.v4.git.1756468502.gitgitgadget@gmail.com>
65
+
66
+
67
+* kh/doc-markup-fixes (2025-09-02) 2 commits
68
+ (merged to 'next' on 2025-09-03 at 1ba7204a04)
69
+ + doc: remove extra backtick for inline-verbatim
70
+ + doc: add missing backtick for inline-verbatim
71
+
72
+ Doc markup fixes.
73
+ source: <cover.1756845314.git.code@khaugsbakk.name>
74
+
75
+
76
+* km/alias-doc-markup-fix (2025-09-01) 1 commit
77
+ (merged to 'next' on 2025-09-03 at 02da1fc9b3)
78
+ + doc: fix formatting of function-wrap shell alias
79
+
80
+ Docfix.
81
+ source: <20250901180419.2212086-1-kyle@kemitchell.com>
82
+
83
+
84
+* ms/refs-exists (2025-08-25) 4 commits
85
+ (merged to 'next' on 2025-09-03 at c6fc4c7461)
86
+ + t: add test for git refs exists subcommand
87
+ + t1422: refactor tests to be shareable
88
+ + t1403: split 'show-ref --exists' tests into a separate file
89
+ + builtin/refs: add 'exists' subcommand
90
+
91
+ "git refs exists" that works like "git show-ref --exists" has been
92
+ added.
93
+ source: <20250826064110.10540-1-meetsoni3017@gmail.com>
94
+
95
+
96
+* ps/gitlab-ci-disable-windows-monitoring (2025-09-02) 1 commit
97
+ (merged to 'next' on 2025-09-03 at f6148f5d05)
98
+ + gitlab-ci: disable realtime monitoring to unbreak Windows jobs
99
+
100
+ Windows "real-time monitoring" interferes with the execution of
101
+ tests and affects negatively in both correctness and performance,
102
+ which has been disabled in Gitlab CI.
103
+ source: <20250902-b4-pks-gitlab-ci-windows-defender-v1-1-fcb1f19321aa@pks.im>
104
+
105
+
106
+* ps/object-store-midx-dedup-info (2025-08-11) 11 commits
107
+ (merged to 'next' on 2025-09-03 at 4b12427226)
108
+ + midx: compute paths via their source
109
+ + midx: stop duplicating info redundant with its owning source
110
+ + midx: write multi-pack indices via their source
111
+ + midx: load multi-pack indices via their source
112
+ + midx: drop redundant `struct repository` parameter
113
+ + odb: simplify calling `link_alt_odb_entry()`
114
+ + odb: return newly created in-memory sources
115
+ + odb: consistently use "dir" to refer to alternate's directory
116
+ + odb: allow `odb_find_source()` to fail
117
+ + odb: store locality in object database sources
118
+ + Merge branch 'ps/object-store-midx' into ps/object-store-midx-dedup-info
119
+ (this branch is used by ps/packfile-store.)
120
+
121
+ Further code clean-up for multi-pack-index code paths.
122
+ source: <20250811-b4-pks-midx-deduplicate-source-info-v3-0-e442bdf2b4ad@pks.im>
123
+
124
+
125
+* rs/describe-with-lazy-queue-and-oidset (2025-09-02) 1 commit
126
+ (merged to 'next' on 2025-09-04 at 1a473401a4)
127
+ + describe: use oidset in finish_depth_computation()
128
+
129
+ Instead of scanning for the remaining items to see if there are
130
+ still commits to be explored in the queue, use khash to remember
131
+ which items are still on the queue (an unacceptable alternative is
132
+ to reserve one object flag bits).
133
+ source: <b16aa099-b683-4a66-acd9-603cc9f0935c@web.de>
134
+
135
+
136
+* tc/t0450-harden (2025-08-08) 2 commits
137
+ (merged to 'next' on 2025-09-04 at 19270d2f92)
138
+ + t0450: add allowlist for builtins with missing .adoc
139
+ + t0450: fix test for out-of-tree builds
140
+
141
+ Test updates.
142
+ source: <20250804073002.1586332-1-toon@iotcl.com>
143
+
144
--------------------------------------------------
145
[New Topics]
146
56
-* jt/odb-transaction (2025-09-09) 7 commits
57
- - odb: add transaction interface
58
- - object-file: update naming from bulk-checkin
59
- - object-file: relocate ODB transaction code
60
- - bulk-checkin: drop flush_odb_transaction()
61
- - builtin/update-index: end ODB transaction when --verbose is specified
62
- - bulk-checkin: remove ODB transaction nesting
63
- - Merge branch 'jt/de-global-bulk-checkin' into jt/odb-transaction
64
- (this branch uses jt/de-global-bulk-checkin.)
147
+* rs/get-oid-with-flags-cleanup (2025-09-10) 1 commit
148
+ - use repo_get_oid_with_flags()
149
+
150
+ Code clean-up.
151
+
152
+ Will merge to 'next'.
153
+ source: <906196ac-2fd7-4c07-9e8f-22d67b0b64f9@web.de>
154
+
155
+
156
+* cs/subtree-squash-split-fix (2025-09-09) 1 commit
157
+ - contrib/subtree: fix split with squashed subtrees
158
+
159
+ "git subtree" (in contrib/) did not work correctly when splitting
160
+ squashed subtrees, which has been improved.
161
+
162
+ Will merge to 'next'.
163
+ source: <20250910031124.1807856-1-ask+git@howdoi.land>
164
66
- Continue the work to build on the bulk-checkin infrastructure to
67
- create many objects at once in a transaction and abstract it into
68
- the generic object layer.
165
+
166
+* ps/clar-updates (2025-09-10) 1 commit
167
+ - t/unit-tests: update clar to fcbed04
168
+
169
+ Import a newer version of the clar unit testing framework.
170
+
171
+ Will merge to 'next'.
172
+ source: <20250910-b4-pks-clar-update-v1-1-26a196237e0a@pks.im>
173
+
174
+
175
+* ps/config-get-color-fixes (2025-09-11) 5 commits
176
+ - builtin/config: do not spawn pager when printing color codes
177
+ - builtin/config: special-case retrieving colors without a key
178
+ - builtin/config: do not die in `get_color()`
179
+ - t1300: small style fixups
180
+ - t1300: write test expectations in the test's body
181
+
182
+ The use of "git config get" command to learn how ANSI color
183
+ sequence is for a particular type, e.g., "git config get
184
+ --type=color --default=reset no.such.thing", isn't very ergonomic.
185
186
Comments?
71
- source: <20250909191134.555689-1-jltobler@gmail.com>
187
+ source: <20250911-pks-config-color-v1-0-3a7c79df65b1@pks.im>
188
189
74
-* cc/fast-import-strip-signed-commits (2025-09-10) 2 commits
75
- - fast-import: add '--signed-commits=<mode>' option
76
- - gpg-interface: refactor 'enum sign_mode' parsing
190
+* ps/meson-build-docs (2025-09-11) 3 commits
191
+ - ci: don't compile whole project when testing docs with Meson
192
+ - meson: print docs backend as part of the summary
193
+ - meson: introduce a "docs" alias to compile documentation only
194
78
- "git fast-import" learned that "--signed-commits=<how>" option that
79
- corresponds to that of "git fast-export".
195
+ The build procedure based on meson learned a target to only build
196
+ documentation, similar to "make doc".
197
198
Comments?
82
- source: <20250910080839.2142651-1-christian.couder@gmail.com>
199
+ source: <20250911-b4-pks-meson-docs-target-v1-0-a92c666ecef9@pks.im>
200
+
201
+
202
+* ps/odb-clean-stale-wrappers (2025-09-10) 1 commit
203
+ . odb: drop deprecated wrapper functions
204
+
205
+ Code clean-up.
206
+
207
+ Breaks build when merged to 'seen'.
208
+ cf. <20250910153759.GA562601@coredump.intra.peff.net>
209
+ source: <20250910-b4-pks-odb-drop-wrappers-v1-1-6ed660cb1eec@pks.im>
210
211
--------------------------------------------------
212
[Stalled]
@@ -143,7 +270,7 @@ well with other topics in 'seen' (and of course 'next' and
270
allow the "partialCloneFilter" settings and the "token" value to be
271
communicated from the server side.
272
146
- Will merge to 'next'?
273
+ Will merge to 'next'.
274
source: <20250908053056.956907-1-christian.couder@gmail.com>
275
276
@@ -167,7 +294,36 @@ well with other topics in 'seen' (and of course 'next' and
294
--------------------------------------------------
295
[Cooking]
296
170
-* pw/3.0-default-initial-branch-to-main (2025-09-04) 4 commits
297
+* jt/odb-transaction (2025-09-09) 7 commits
298
+ - odb: add transaction interface
299
+ - object-file: update naming from bulk-checkin
300
+ - object-file: relocate ODB transaction code
301
+ - bulk-checkin: drop flush_odb_transaction()
302
+ - builtin/update-index: end ODB transaction when --verbose is specified
303
+ - bulk-checkin: remove ODB transaction nesting
304
+ - Merge branch 'jt/de-global-bulk-checkin' into jt/odb-transaction
305
+ (this branch uses jt/de-global-bulk-checkin.)
306
+
307
+ Continue the work to build on the bulk-checkin infrastructure to
308
+ create many objects at once in a transaction and abstract it into
309
+ the generic object layer.
310
+
311
+ Comments?
312
+ source: <20250909191134.555689-1-jltobler@gmail.com>
313
+
314
+
315
+* cc/fast-import-strip-signed-commits (2025-09-12) 2 commits
316
+ - fast-import: add '--signed-commits=<mode>' option
317
+ - gpg-interface: refactor 'enum sign_mode' parsing
318
+
319
+ "git fast-import" learned that "--signed-commits=<how>" option that
320
+ corresponds to that of "git fast-export".
321
+
322
+ Comments?
323
+ source: <20250912124042.2523683-1-christian.couder@gmail.com>
324
+
325
+
326
+* pw/3.0-default-initial-branch-to-main (2025-09-10) 4 commits
327
- t0613: stop setting default initial branch
328
- t9902: switch default branch name to main
329
- t4013: switch default branch name to main
@@ -176,8 +332,8 @@ well with other topics in 'seen' (and of course 'next' and
332
Declare that "git init" that is not otherwise configured uses
333
'main' as the initial branch, not 'master', starting Git 3.0.
334
179
- Will merge to 'next'?
180
- source: <cover.1756992089.git.phillip.wood@dunelm.org.uk>
335
+ Comments?
336
+ source: <cover.1757518141.git.phillip.wood@dunelm.org.uk>
337
338
339
* rs/object-name-extend-abbrev-len-update (2025-09-04) 1 commit
@@ -204,11 +360,12 @@ well with other topics in 'seen' (and of course 'next' and
360
source: <20250904-b4-pks-commit-graph-via-source-v1-0-d932c2481e1a@pks.im>
361
362
207
-* ps/rust-balloon (2025-09-08) 8 commits
363
+* ps/rust-balloon (2025-09-10) 9 commits
364
- ci: enable Rust for breaking-changes jobs
365
- ci: convert "pedantic" job into full build with breaking changes
366
- BreakingChanges: announce Rust becoming mandatory
211
- - rust: implement a test balloon via the "varint" subsystem
367
+ - varint: reimplement as test balloon for Rust
368
+ - varint: use explicit width for integers
369
- help: report on whether or not Rust is enabled
370
- Makefile: introduce infrastructure to build internal Rust library
371
- Makefile: reorder sources after includes
@@ -216,15 +373,18 @@ well with other topics in 'seen' (and of course 'next' and
373
374
Dip our toes a bit to (optionally) use Rust implemented helper
375
called from our C code.
219
- source: <20250908-b4-pks-rust-breaking-change-v3-0-1cd7189fed3b@pks.im>
376
+
377
+ Comments?
378
+ source: <20250910-b4-pks-rust-breaking-change-v4-0-4a63fc69278d@pks.im>
379
380
381
* kh/doc-fast-import-markup-fix (2025-09-08) 1 commit
223
- - doc: fast-import: replace literal block with paragraph
382
+ (merged to 'next' on 2025-09-12 at d56e1334b9)
383
+ + doc: fast-import: replace literal block with paragraph
384
385
Doc mark-up fix.
386
227
- Will merge to 'next'.
387
+ Will merge to 'master'.
388
source: <09aaad696895c18c6d4dda7d6a2f4b77f84f39ba.1757363213.git.code@khaugsbakk.name>
389
390
@@ -272,43 +432,6 @@ well with other topics in 'seen' (and of course 'next' and
432
source: <pull.1965.v3.git.1757100378.gitgitgadget@gmail.com>
433
434
275
-* km/alias-doc-markup-fix (2025-09-01) 1 commit
276
- (merged to 'next' on 2025-09-03 at 02da1fc9b3)
277
- + doc: fix formatting of function-wrap shell alias
278
-
279
- Docfix.
280
-
281
- Will merge to 'master'.
282
- source: <20250901180419.2212086-1-kyle@kemitchell.com>
283
-
284
-
285
-* ms/refs-exists (2025-08-25) 4 commits
286
- (merged to 'next' on 2025-09-03 at c6fc4c7461)
287
- + t: add test for git refs exists subcommand
288
- + t1422: refactor tests to be shareable
289
- + t1403: split 'show-ref --exists' tests into a separate file
290
- + builtin/refs: add 'exists' subcommand
291
-
292
- "git refs exists" that works like "git show-ref --exists" has been
293
- added.
294
-
295
- Will merge to 'master'.
296
- cf. <aLbahNFrs9jchnXZ@pks.im>
297
- source: <20250826064110.10540-1-meetsoni3017@gmail.com>
298
-
299
-
300
-* ps/gitlab-ci-disable-windows-monitoring (2025-09-02) 1 commit
301
- (merged to 'next' on 2025-09-03 at f6148f5d05)
302
- + gitlab-ci: disable realtime monitoring to unbreak Windows jobs
303
-
304
- Windows "real-time monitoring" interferes with the execution of
305
- tests and affects negatively in both correctness and performance,
306
- which has been disabled in Gitlab CI.
307
-
308
- Will merge to 'master'.
309
- source: <20250902-b4-pks-gitlab-ci-windows-defender-v1-1-fcb1f19321aa@pks.im>
310
-
311
-
435
* ps/packfile-store (2025-09-09) 16 commits
436
- packfile: refactor `get_packed_git_mru()` to work on packfile store
437
- packfile: refactor `get_all_packs()` to work on packfile store
@@ -326,7 +449,6 @@ well with other topics in 'seen' (and of course 'next' and
449
- odb: move list of packfiles into `struct packfile_store`
450
- packfile: introduce a new `struct packfile_store`
451
- Merge branch 'ps/object-store-midx-dedup-info' into ps/packfile-store
329
- (this branch uses ps/object-store-midx-dedup-info.)
452
453
Code clean-up around the in-core list of all the pack files and
454
object database(s).
@@ -335,17 +457,6 @@ well with other topics in 'seen' (and of course 'next' and
457
source: <20250909-b4-pks-packfiles-store-v4-0-151c4ba3619f@pks.im>
458
459
338
-* kh/doc-markup-fixes (2025-09-02) 2 commits
339
- (merged to 'next' on 2025-09-03 at 1ba7204a04)
340
- + doc: remove extra backtick for inline-verbatim
341
- + doc: add missing backtick for inline-verbatim
342
-
343
- Doc markup fixes.
344
-
345
- Will merge to 'master'.
346
- source: <cover.1756845314.git.code@khaugsbakk.name>
347
-
348
-
460
* kn/refs-files-case-insensitive (2025-09-08) 4 commits
461
- refs/files: handle D/F conflicts during locking
462
- refs/files: handle F/D conflicts in case-insensitive FS
@@ -380,23 +491,13 @@ well with other topics in 'seen' (and of course 'next' and
491
source: <20250905-b4-pks-upload-pack-repeated-non-commit-acks-v2-0-d2e67f3cb94c@pks.im>
492
493
383
-* tc/t0450-harden (2025-08-08) 2 commits
384
- (merged to 'next' on 2025-09-04 at 19270d2f92)
385
- + t0450: add allowlist for builtins with missing .adoc
386
- + t0450: fix test for out-of-tree builds
387
-
388
- Test updates.
389
-
390
- Will merge to 'master'.
391
- source: <20250804073002.1586332-1-toon@iotcl.com>
392
-
393
-
494
* ag/doc-sendmail-gmail-example-update (2025-08-26) 1 commit
395
- - docs: update sendmail docs to use more secure SMTP server for Gmail
495
+ (merged to 'next' on 2025-09-12 at 54e0dab4b0)
496
+ + docs: update sendmail docs to use more secure SMTP server for Gmail
497
498
Doc update.
499
399
- Will merge to 'next'?
500
+ Will merge to 'master'.
501
source: <20250826150919.5239-1-gargaditya08@live.com>
502
503
@@ -425,41 +526,44 @@ well with other topics in 'seen' (and of course 'next' and
526
source: <pull.2048.git.git.1757274320.gitgitgadget@gmail.com>
527
528
428
-* je/doc-checkout (2025-09-03) 6 commits
529
+* je/doc-checkout (2025-09-10) 7 commits
530
- doc: git-checkout: clarify restoring files section
531
- doc: git-checkout: split up restoring files section
532
- doc: git-checkout: deduplicate --detach explanation
533
- doc: git-checkout: clarify `-b` and `-B`
534
- doc: git-checkout: clarify `git checkout <branch>`
434
- - doc: git-checkout: clarify intro
535
+ - doc: git-checkout: clarify ARGUMENT DISAMBIGUATION
536
+ - doc: git-checkout: clarify intro sentence
537
538
Doc updates.
539
438
- Expecting a (hopefully small and final) reroll.
439
- cf. <07e52117-96da-4443-8974-08a22516ed75@app.fastmail.com>
440
- source: <pull.1962.v3.git.1756918202.gitgitgadget@gmail.com>
540
+ Comments?
541
+ source: <pull.1962.v4.git.1757531669.gitgitgadget@gmail.com>
542
543
544
* kn/clang-format-bitfields (2025-08-26) 1 commit
444
- - Documentation: note styling for bit fields
545
+ (merged to 'next' on 2025-09-12 at 62dd6102f6)
546
+ + Documentation: note styling for bit fields
547
548
CodingGuidelines now spells out how bitfields are to be written.
549
448
- Will merge to 'next'?
550
+ Will merge to 'master'.
551
source: <20250826121928.22317-1-karthik.188@gmail.com>
552
553
554
* jk/curl-global-trace-components (2025-08-27) 1 commit
453
- - curl: add support for curl_global_trace() components
555
+ (merged to 'next' on 2025-09-12 at 37a826f245)
556
+ + curl: add support for curl_global_trace() components
557
558
Adjust to the way newer versions of cURL selectivel enables tracing
559
options, so that our tests can continue to work.
560
458
- Will merge to 'next'?
561
+ Will merge to 'master'.
562
source: <20250827080702.GA3572995@coredump.intra.peff.net>
563
564
462
-* kh/you-still-use-whatchanged-fix (2025-09-09) 7 commits
565
+* kh/you-still-use-whatchanged-fix (2025-09-10) 8 commits
566
+ - fixup! git: allow alias-shadowing deprecated builtins
567
- BreakingChanges: remove claim about whatchanged reports
568
- whatchanged: remove not-even-shorter clause
569
- whatchanged: tell users the git-log(1) equivalent
@@ -471,42 +575,32 @@ well with other topics in 'seen' (and of course 'next' and
575
Update "do you still use it?" message given by a command that is
576
deeply deprecated and allow us to suggest alternatives.
577
474
- Will merge to 'next'?
578
+ Expecting a (hopefully minor and final) reroll to fix the infinite recursion.
579
+ cf. <20250911203256.GA1894340@coredump.intra.peff.net>
580
source: <cover.1757446619.git.code@khaugsbakk.name>
581
582
583
* pc/range-diff-memory-limit (2025-08-29) 1 commit
479
- - range-diff: add configurable memory limit for cost matrix
584
+ (merged to 'next' on 2025-09-12 at 022fe71829)
585
+ + range-diff: add configurable memory limit for cost matrix
586
587
"git range-diff" learned a way to limit the memory consumed by
588
O(N*N) cost matrix.
589
484
- Will merge to 'next'?
590
+ Will merge to 'master'.
591
source: <pull.1958.v4.git.1756483374980.gitgitgadget@gmail.com>
592
593
594
* ne/alloc-free-and-null (2025-09-04) 1 commit
489
- - alloc: fix dangling pointer in alloc_state cleanup
595
+ (merged to 'next' on 2025-09-12 at 005f763f97)
596
+ + alloc: fix dangling pointer in alloc_state cleanup
597
598
The clear_alloc_state() API function was not fully clearing the
599
structure for reuse, but since nobody reuses it, replace it with a
600
variant that frees the structure as well, making the callers simpler.
601
495
- Will merge to 'next'?
496
- source: <pull.2040.v5.git.git.1757007856062.gitgitgadget@gmail.com>
497
-
498
-
499
-* rs/describe-with-lazy-queue-and-oidset (2025-09-02) 1 commit
500
- (merged to 'next' on 2025-09-04 at 1a473401a4)
501
- + describe: use oidset in finish_depth_computation()
502
-
503
- Instead of scanning for the remaining items to see if there are
504
- still commits to be explored in the queue, use khash to remember
505
- which items are still on the queue (an unacceptable alternative is
506
- to reserve one object flag bits).
507
-
602
Will merge to 'master'.
509
- source: <b16aa099-b683-4a66-acd9-603cc9f0935c@web.de>
603
+ source: <pull.2040.v5.git.git.1757007856062.gitgitgadget@gmail.com>
604
605
606
* lo/repo-info-step-2 (2025-09-04) 3 commits
@@ -524,11 +618,12 @@ well with other topics in 'seen' (and of course 'next' and
618
619
620
* jc/doc-includeif-hasconfig-remote-url-fix (2025-08-21) 1 commit
527
- - config: document includeIf conditions consistently
621
+ (merged to 'next' on 2025-09-12 at 3b91910cbd)
622
+ + config: document includeIf conditions consistently
623
624
Doc mark-up fix.
625
531
- Will merge to 'next'?
626
+ Will merge to 'master'.
627
source: <xmqqldnc4stv.fsf@gitster.g>
628
629
@@ -542,7 +637,7 @@ well with other topics in 'seen' (and of course 'next' and
637
color.ui configuration variables, which is an old regression, which
638
has been corrected.
639
545
- Will merge to 'next'?
640
+ Will merge to 'next'.
641
source: <20250908164157.GA1323487@coredump.intra.peff.net>
642
643
@@ -563,102 +658,68 @@ well with other topics in 'seen' (and of course 'next' and
658
source: <20250822213500.1488064-1-jltobler@gmail.com>
659
660
566
-* je/doc-add (2025-08-29) 3 commits
567
- (merged to 'next' on 2025-09-02 at 6aa32994dd)
568
- + doc: rephrase the purpose of the staging area
569
- (merged to 'next' on 2025-08-25 at 0c84501ed2)
570
- + doc: git-add: simplify discussion of ignored files
571
- + doc: git-add: clarify intro & add an example
572
-
573
- Documentation for "git add" has been updated.
574
-
575
- Will merge to 'master'.
576
- source: <pull.1952.v3.git.1755636370.gitgitgadget@gmail.com>
577
- source: <pull.1952.v4.git.1756468502.gitgitgadget@gmail.com>
578
-
579
-
661
* sg/line-log-boundary-fixes (2025-08-18) 2 commits
581
- - line-log: show all line ranges touched by the same diff range
582
- - line-log: fix assertion error
662
+ (merged to 'next' on 2025-09-12 at 0d34d3872c)
663
+ + line-log: show all line ranges touched by the same diff range
664
+ + line-log: fix assertion error
665
666
Fix for a corner case bug in "git log -L...".
667
586
- Will merge to 'next'?
668
+ Will merge to 'master'.
669
source: <20250818111310.1283932-1-szeder.dev@gmail.com>
670
671
672
* jc/longer-disambiguation-fix (2025-08-14) 1 commit
591
- - abbrev: allow extending beyond 32 chars to disambiguate
673
+ (merged to 'next' on 2025-09-12 at 4dddaa05fc)
674
+ + abbrev: allow extending beyond 32 chars to disambiguate
675
676
"git rev-parse --short" and friends failed to disambiguate two
677
objects with object names that share common prefix longer than 32
678
characters.
679
597
- Will merge to 'next'?
598
- source: <xmqqh5ya6iua.fsf_-_@gitster.g>
599
-
600
-
601
-* ps/object-store-midx-dedup-info (2025-08-11) 11 commits
602
- (merged to 'next' on 2025-09-03 at 4b12427226)
603
- + midx: compute paths via their source
604
- + midx: stop duplicating info redundant with its owning source
605
- + midx: write multi-pack indices via their source
606
- + midx: load multi-pack indices via their source
607
- + midx: drop redundant `struct repository` parameter
608
- + odb: simplify calling `link_alt_odb_entry()`
609
- + odb: return newly created in-memory sources
610
- + odb: consistently use "dir" to refer to alternate's directory
611
- + odb: allow `odb_find_source()` to fail
612
- + odb: store locality in object database sources
613
- + Merge branch 'ps/object-store-midx' into ps/object-store-midx-dedup-info
614
- (this branch is used by ps/packfile-store.)
615
-
616
- Further code clean-up for multi-pack-index code paths.
617
-
680
Will merge to 'master'.
619
- cf. <aLaQWPK0Kxw8o7VV@pks.im>
620
- source: <20250811-b4-pks-midx-deduplicate-source-info-v3-0-e442bdf2b4ad@pks.im>
681
+ source: <xmqqh5ya6iua.fsf_-_@gitster.g>
682
683
684
* ag/send-email-imap-sent (2025-08-11) 2 commits
624
- - send-email: enable copying emails to an IMAP folder without actually sending them
625
- - send-email: add ability to send a copy of sent emails to an IMAP folder
685
+ (merged to 'next' on 2025-09-12 at bb82691e0a)
686
+ + send-email: enable copying emails to an IMAP folder without actually sending them
687
+ + send-email: add ability to send a copy of sent emails to an IMAP folder
688
689
"git send-email" learned to drive "git imap-send" to store already
690
sent e-mails in an IMAP folder.
691
630
- Will merge to 'next'?
692
+ Will merge to 'master'.
693
source: <PN3PR01MB9597E8E33868386C997D2563B82BA@PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM>
694
695
634
-* ds/sparse-checkout-clean (2025-07-16) 7 commits
635
- - sparse-checkout: make 'clean' clear more files
696
+* ds/sparse-checkout-clean (2025-09-12) 7 commits
697
- t: expand tests around sparse merges and clean
698
- sparse-index: point users to new 'clean' action
699
- sparse-checkout: add --verbose option to 'clean'
700
- dir: add generic "walk all files" helper
701
- sparse-checkout: match some 'clean' behavior
702
- sparse-checkout: add basics of 'clean' command
703
+ - sparse-checkout: remove use of the_repository
704
705
"git sparse-checkout" subcommand learned a new "clean" action to
706
prune otherwise unused working-tree files that are outside the
707
areas of interest.
708
647
- Waiting for review responses?
648
- cf. <c3c0fbef-f395-4972-8352-dd89af6799d5@gmail.com>
649
- (Rebased not to depend on ac/deglobal-sparse-variables)
650
- source: <pull.1941.v2.git.1752716054.gitgitgadget@gmail.com>
709
+ Will merge to 'next'?
710
+ source: <pull.1941.v3.git.1757673011.gitgitgadget@gmail.com>
711
712
713
* pw/3.0-commentchar-auto-deprecation (2025-08-26) 4 commits
654
- - commit: print advice when core.commentString=auto
655
- - config: warn on core.commentString=auto
656
- - breaking-changes: deprecate support for core.commentString=auto
657
- - Merge branch 'ps/config-wo-the-repository' into pw/3.0-commentchar-auto-deprecation
714
+ (merged to 'next' on 2025-09-12 at e6a855d738)
715
+ + commit: print advice when core.commentString=auto
716
+ + config: warn on core.commentString=auto
717
+ + breaking-changes: deprecate support for core.commentString=auto
718
+ + Merge branch 'ps/config-wo-the-repository' into pw/3.0-commentchar-auto-deprecation
719
720
Proposes to deprecate "core.commentChar=auto" that attempts to
721
dynamically pick a suitable comment character, as it is too much
722
trouble to support for little benefit.
723
663
- Will merge to 'next'?
724
+ Will merge to 'master'.
725
source: <cover.1756215326.git.phillip.wood@dunelm.org.uk>