What's cooking (2025/03 #07)
Junio C Hamano committed
Mar 26, 2025 at 16:47 UTC
0084a813e725aaab79848773e390465283101287
1 file changed
+273
-138
whats-cooking.txt
+273
-138
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2025, #06; Fri, 21)
3
-X-master-at: 683c54c999c301c2cd6f715c411407c413b1d84e
4
-X-next-at: e94155a9ecafb89f308d834dea8fed4f7ad85d2a
2
+Subject: What's cooking in git.git (Mar 2025, #07; Wed, 26)
3
+X-master-at: 66b90d9bad8476f6f3d71f5add5cf78809a998ed
4
+X-next-at: 12c9017322054d91838b18540dea310d9448fd6e
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Mar 2025, #06; Fri, 21)
7
+What's cooking in git.git (Mar 2025, #07; Wed, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -17,6 +17,9 @@ topic without enough support may be discarded after a long period of
17
no activity (of course they can be resubmit when new interests
18
arise).
19
20
+I am still officially on vacation, but 2.50 cycle has been started
21
+and the first batch of topics are now in 'master'.
22
+
23
Copies of the source code to Git live in many repositories, and the
24
following is a list of the ones I push into or their mirrors. Some
25
repositories have only a subset of branches.
@@ -45,9 +48,217 @@ Release tarballs are available at:
48
49
https://www.kernel.org/pub/software/scm/git/
50
51
+--------------------------------------------------
52
+[Graduated to 'master']
53
+
54
+* en/merge-process-renames-crash-fix (2025-03-06) 2 commits
55
+ (merged to 'next' on 2025-03-06 at 8f38331e32)
56
+ + merge-ort: fix slightly overzealous assertion for rename-to-self
57
+ + t6423: add a testcase causing a failed assertion in process_renames
58
+
59
+ The merge-recursive and merge-ort machinery crashed in corner cases
60
+ when certain renames are involved.
61
+
62
+ source: <pull.1873.git.1741275027.gitgitgadget@gmail.com>
63
+
64
+
65
+* ja/doc-block-delimiter-markup-fix (2025-03-10) 1 commit
66
+ (merged to 'next' on 2025-03-11 at 8d6641a77e)
67
+ + doc: add a blank line around block delimiters
68
+
69
+ Doc markup updates.
70
+
71
+ source: <pull.1878.git.1741549511665.gitgitgadget@gmail.com>
72
+
73
+
74
+* jt/diff-pairs (2025-03-03) 4 commits
75
+ (merged to 'next' on 2025-03-03 at 32346e0c3b)
76
+ + builtin/diff-pairs: allow explicit diff queue flush
77
+ + builtin: introduce diff-pairs command
78
+ + diff: add option to skip resolving diff statuses
79
+ + diff: return diff_filepair from diff queue helpers
80
+
81
+ A post-processing filter for "diff --raw" output has been
82
+ introduced.
83
+
84
+ source: <20250228213346.1335224-1-jltobler@gmail.com>
85
+
86
+
87
+* sj/ref-consistency-checks-more (2025-02-27) 9 commits
88
+ (merged to 'next' on 2025-03-05 at 6bea9376c4)
89
+ + builtin/fsck: add `git refs verify` child process
90
+ + packed-backend: check whether the "packed-refs" is sorted
91
+ + packed-backend: add "packed-refs" entry consistency check
92
+ + packed-backend: check whether the refname contains NUL characters
93
+ + packed-backend: add "packed-refs" header consistency check
94
+ + packed-backend: check if header starts with "# pack-refs with: "
95
+ + packed-backend: check whether the "packed-refs" is regular file
96
+ + builtin/refs: get worktrees without reading head information
97
+ + t0602: use subshell to ensure working directory unchanged
98
+
99
+ "git fsck" becomes more careful when checking the refs.
100
+
101
+ source: <Z8CMx7O19PMs9sVY@ArchLinux>
102
+
103
+
104
+* tb/refs-exclude-fixes (2025-03-06) 2 commits
105
+ (merged to 'next' on 2025-03-06 at 50707f29db)
106
+ + refs.c: stop matching non-directory prefixes in exclude patterns
107
+ + refs.c: remove empty '--exclude' patterns
108
+
109
+ The refname exclusion logic in the packed-ref backend has been
110
+ broken for some time, which confused upload-pack to advertise
111
+ different set of refs. This has been corrected.
112
+
113
+ source: <cover.1741275245.git.me@ttaylorr.com>
114
+
115
+
116
+* ua/some-builtins-wo-the-repository (2025-03-07) 8 commits
117
+ (merged to 'next' on 2025-03-07 at 01f2b84529)
118
+ + builtin/checkout-index: stop using `the_repository`
119
+ + builtin/for-each-ref: stop using `the_repository`
120
+ + builtin/ls-files: stop using `the_repository`
121
+ + builtin/pack-refs: stop using `the_repository`
122
+ + builtin/send-pack: stop using `the_repository`
123
+ + builtin/verify-commit: stop using `the_repository`
124
+ + builtin/verify-tag: stop using `the_repository`
125
+ + config: teach repo_config to allow `repo` to be NULL
126
+
127
+ A handful of built-in command implementations have been rewritten
128
+ to use the repository instance supplied by git.c:run_builtin(), its
129
+ caller.
130
+
131
+ source: <20250307233543.1721552-1-usmanakinyemi202@gmail.com>
132
+
133
--------------------------------------------------
134
[New Topics]
135
136
+* ds/maintenance-loose-objects-batchsize (2025-03-23) 2 commits
137
+ - maintenance: add loose-objects.batchSize config
138
+ - maintenance: force progress/no-quiet to children
139
+
140
+ The job to coalesce loose objects into packfiles in "git
141
+ maintenance" now has configurable batch size.
142
+
143
+ Will merge to 'next'?
144
+ source: <pull.1885.git.1742777512.gitgitgadget@gmail.com>
145
+
146
+
147
+* js/libgit-cargo-package (2025-03-22) 5 commits
148
+ . libgit-{sys,rs}: add license and description fields
149
+ . libgit-sys: exclude unnecessary directories in git-src
150
+ . libgit-sys: parallelize build with Cargo's jobserver
151
+ . libgit-sys: add symlink to git repo root and build out of tree
152
+ . libgitpub: move to separate contrib/ directory
153
+
154
+ Breaks Windows CI job with "../.." symbolic link in the source.
155
+ source: <cover.1742594960.git.steadmon@google.com>
156
+
157
+
158
+* jt/clone-guess-remote-head-fix (2025-03-25) 3 commits
159
+ - advice: allow disabling default branch name advice
160
+ - builtin/clone: suppress unexpected default branch advice
161
+ - remote: allow `guess_remote_head()` to suppress advice
162
+
163
+ "git clone" still gave the message about the default branch name;
164
+ this message has been turned into an advice message that can be
165
+ turned off.
166
+ source: <20250325005148.1771502-1-jltobler@gmail.com>
167
+
168
+
169
+* lo/userdiff-gitconfig (2025-03-23) 1 commit
170
+ - userdiff: add builtin driver for gitconfig syntax
171
+
172
+ Expecting a reroll?
173
+ source: <20250324021101.7483-1-lucasseikioshiro@gmail.com>
174
+
175
+
176
+* rs/clear-commit-marks-simplify (2025-03-24) 1 commit
177
+ - commit: move clear_commit_marks_many() loop body to clear_commit_marks()
178
+
179
+ Code clean-up.
180
+
181
+ Will merge to 'next'.
182
+ source: <80bfd7a9-904c-49d8-a367-ca268c096a9f@web.de>
183
+
184
+
185
+* ta/bulk-checkin-signed-compare-false-warning-fix (2025-03-25) 1 commit
186
+ - bulk-checkin: fix sign compare warnings
187
+
188
+ Compiler warnings workaround.
189
+
190
+ Will merge to 'next'.
191
+ source: <20250324214703.7547-1-taahol@utu.fi>
192
+
193
+
194
+* dk/vimdiff-doc-fix (2025-03-25) 1 commit
195
+ - vimdiff: clarify the sigil used for marking the buffer to save
196
+
197
+ Doc update.
198
+
199
+ Will merge to 'next'.
200
+ source: <20250324205327.79627-1-ben.knoble+github@gmail.com>
201
+
202
+
203
+* es/meson-build-skip-coccinelle (2025-03-25) 1 commit
204
+ - meson: disable coccinelle configuration when building from a tarball
205
+
206
+ Build fix.
207
+
208
+ Will merge to 'next'.
209
+ source: <20250325200920.198057-1-eschwartz@gentoo.org>
210
+
211
+
212
+* fr/vimdiff-layout-fixes (2025-03-25) 2 commits
213
+ - mergetools: vimdiff: add tests for layout with REMOTE as the target
214
+ - mergetools: vimdiff: fix layout where REMOTE is the target
215
+
216
+ Layout configuration in vimdiff backend didn't work as advertised,
217
+ which has been corrected.
218
+
219
+ Will merge to 'next'.
220
+ source: <20250325222311.400748-1-greenfoo@u92.eu>
221
+
222
+
223
+* js/comma-semicolon-confusion (2025-03-25) 10 commits
224
+ - detect-compiler: detect clang even if it found CUDA
225
+ - clang: warn when the comma operator is used
226
+ - compat/regex: explicitly mark intentional use of the comma operator
227
+ - wildmatch: explicitly mark intentional use of the comma operator
228
+ - diff-delta: explicitly mark intentional use of the comma operator
229
+ - xdiff: avoid using the comma operator unnecessarily
230
+ - clar: avoid using the comma operator unnecessarily
231
+ - kwset: avoid using the comma operator unnecessarily
232
+ - rebase: avoid using the comma operator unnecessarily
233
+ - remote-curl: avoid using the comma operator unnecessarily
234
+
235
+ Code clean-up.
236
+
237
+ Will merge to 'next'?
238
+ source: <pull.1889.v2.git.1742945534.gitgitgadget@gmail.com>
239
+
240
+
241
+* js/imap-send-peer-cert-verify (2025-03-25) 1 commit
242
+ (merged to 'next' on 2025-03-26 at 69df4dd915)
243
+ + imap-send: explicitly verify the peer certificate
244
+
245
+ Will merge to 'master'.
246
+ source: <pull.1886.git.1742819282360.gitgitgadget@gmail.com>
247
+
248
+
249
+* js/mingw-admins-are-special (2025-03-25) 2 commits
250
+ (merged to 'next' on 2025-03-26 at dfcb9661a6)
251
+ + test-tool path-utils: support debugging "dubious ownership" issues
252
+ + mingw: special-case administrators even more
253
+
254
+ "Dubious ownership" checks on Windows has been tightened up.
255
+
256
+ Will merge to 'master'.
257
+ source: <pull.1893.git.1742899110.gitgitgadget@gmail.com>
258
+
259
+--------------------------------------------------
260
+[Cooking]
261
+
262
* en/assert-wo-side-effects (2025-03-21) 3 commits
263
- treewide: replace assert() with ASSERT() in special cases
264
- ci: add build checking for side-effects in assert() calls
@@ -71,13 +282,14 @@ Release tarballs are available at:
282
283
284
* kn/ci-meson-check-build-docs-fix (2025-03-20) 1 commit
74
- - ci/github: add missing 'CI_JOB_IMAGE' env variable
285
+ (merged to 'next' on 2025-03-24 at 135ce9ce61)
286
+ + ci/github: add missing 'CI_JOB_IMAGE' env variable
287
288
GitHub Actions CI switched on a CI/CD variable that does not exist
289
when choosing what packages to install etc., which has been
290
corrected.
291
80
- Will merge to 'next'.
292
+ Will merge to 'master'.
293
source: <20250319163328.525284-1-karthik.188@gmail.com>
294
295
@@ -95,11 +307,12 @@ Release tarballs are available at:
307
308
309
* tb/bitamp-typofix (2025-03-21) 1 commit
98
- - pseudo-merge.h: fix a typo
310
+ (merged to 'next' on 2025-03-26 at f068ddb5bb)
311
+ + pseudo-merge.h: fix a typo
312
313
Typofix.
314
102
- Will merge to 'next'.
315
+ Will merge to 'master'.
316
source: <3b3cc5c0fa2d0696eb15c5d3c97a6c93a0d39252.1742338479.git.me@ttaylorr.com>
317
318
@@ -132,26 +345,25 @@ Release tarballs are available at:
345
source: <cover.1742338207.git.me@ttaylorr.com>
346
347
135
-* zy/send-email-error-handling (2025-03-21) 2 commits
136
- . send-email: finer-grained SMTP error handling
137
- . send-email: capture errors in an eval {} block
348
+* zy/send-email-error-handling (2025-03-25) 2 commits
349
+ - send-email: finer-grained SMTP error handling
350
+ - send-email: capture errors in an eval {} block
351
352
Auth-related (and unrelated) error handling in send-email has been
353
made more robust.
354
142
- Breaks t9001.
143
- source: <20250321025128.68463-1-05ZYT30@gmail.com>
355
+ Getting there.
356
+ source: <20250324145332.571813-1-05ZYT30@gmail.com>
357
145
---------------------------------------------------
146
-[Cooking]
358
359
* aj/doc-restore-p-update (2025-03-18) 1 commit
149
- - doc: restore: remove note on --patch w/ pathspecs
360
+ (merged to 'next' on 2025-03-24 at bdcfdc7f4e)
361
+ + doc: restore: remove note on --patch w/ pathspecs
362
363
Stale description in "git restore -p" documentation has been
364
updated.
365
154
- Will merge to 'next'.
366
+ Will merge to 'master'.
367
source: <pull.1504.v2.git.git.1685654097812.gitgitgadget@gmail.com>
368
369
@@ -190,12 +402,13 @@ Release tarballs are available at:
402
403
404
* ja/doc-branch-markup (2025-03-20) 2 commits
193
- - doc: apply new format to git-branch man page
194
- - completion: take into account the formatting backticks for options
405
+ (merged to 'next' on 2025-03-24 at ba6e1c7d0b)
406
+ + doc: apply new format to git-branch man page
407
+ + completion: take into account the formatting backticks for options
408
409
Doc mark-up updates.
410
198
- Will merge to 'next'.
411
+ Will merge to 'master'.
412
source: <pull.1880.v2.git.1742372183.gitgitgadget@gmail.com>
413
414
@@ -231,28 +444,30 @@ Release tarballs are available at:
444
445
446
* tb/combine-cruft-below-size (2025-03-21) 6 commits
234
- - repack: begin combining cruft packs with `--combine-cruft-below-size`
235
- - repack: avoid combining cruft packs with `--max-cruft-size`
236
- - t/t7704-repack-cruft.sh: consolidate `write_blob()`
237
- - t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests
238
- - t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests
239
- - Merge branch 'tb/multi-cruft-pack-refresh-fix' into tb/combine-cruft-below-size
447
+ (merged to 'next' on 2025-03-24 at 699b83a925)
448
+ + repack: begin combining cruft packs with `--combine-cruft-below-size`
449
+ + repack: avoid combining cruft packs with `--max-cruft-size`
450
+ + t/t7704-repack-cruft.sh: consolidate `write_blob()`
451
+ + t/t7704-repack-cruft.sh: clarify wording in --max-cruft-size tests
452
+ + t/t5329-pack-objects-cruft.sh: evict 'repack'-related tests
453
+ + Merge branch 'tb/multi-cruft-pack-refresh-fix' into tb/combine-cruft-below-size
454
(this branch uses tb/multi-cruft-pack-refresh-fix.)
455
456
"git repack" learned "--combine-cruft-below-size" option that
457
controls how cruft-packs are combined.
458
245
- Will merge to 'next'.
459
+ Will merge to 'master'.
460
source: <cover.1742424671.git.me@ttaylorr.com>
461
462
463
* jh/hash-init-fixes (2025-03-18) 1 commit
250
- - index-pack, unpack-objects: restore missing ->init_fn
464
+ (merged to 'next' on 2025-03-24 at 85b8299403)
465
+ + index-pack, unpack-objects: restore missing ->init_fn
466
467
An earlier code refactoring of the hash machinery missed a few
468
required calls to init_fn.
469
255
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
cf. <Z9rC0VCbh8Noaq4e@pks.im>
472
source: <20250318111616.113941-1-hmz007@gmail.com>
473
@@ -272,21 +487,23 @@ Release tarballs are available at:
487
488
489
* pw/build-breaking-changes-doc (2025-03-18) 1 commit
275
- - docs: add BreakingChanges to TECH_DOCS target
490
+ (merged to 'next' on 2025-03-24 at 56efeea47e)
491
+ + docs: add BreakingChanges to TECH_DOCS target
492
493
A documentation page was left out from formatting and installation,
494
which has been corrected.
495
280
- Will merge to 'next'.
496
+ Will merge to 'master'.
497
source: <pull.1921.git.git.1742308900290.gitgitgadget@gmail.com>
498
499
500
* pw/doc-pack-refs-markup-fix (2025-03-18) 1 commit
285
- - pack-refs doc: fix indentation for --exclude
501
+ (merged to 'next' on 2025-03-24 at 3bcea36a83)
502
+ + pack-refs doc: fix indentation for --exclude
503
504
Doc markup fix.
505
289
- Will merge to 'next'.
506
+ Will merge to 'master'.
507
source: <pull.1920.git.git.1742308828163.gitgitgadget@gmail.com>
508
509
@@ -349,7 +566,7 @@ Release tarballs are available at:
566
source: <7c219279-8151-49c0-8fc0-8abe2624aca9@gmail.com>
567
568
352
-* ds/path-walk-2 (2025-03-10) 13 commits
569
+* ds/path-walk-2 (2025-03-25) 13 commits
570
- pack-objects: allow --shallow and --path-walk
571
- path-walk: add new 'edge_aggressive' option
572
- pack-objects: thread the path-based compression
@@ -366,32 +583,25 @@ Release tarballs are available at:
583
584
"git pack-objects" learns to find delta bases from blobs at the
585
same path, using the --path-walk API.
369
- source: <pull.1819.git.1741571455.gitgitgadget@gmail.com>
586
371
-
372
-* ja/doc-block-delimiter-markup-fix (2025-03-10) 1 commit
373
- (merged to 'next' on 2025-03-11 at 8d6641a77e)
374
- + doc: add a blank line around block delimiters
375
-
376
- Doc markup updates.
377
-
378
- Will merge to 'master'.
379
- source: <pull.1878.git.1741549511665.gitgitgadget@gmail.com>
587
+ Comments?
588
+ source: <pull.1819.v2.git.1742829769.gitgitgadget@gmail.com>
589
590
591
* jc/name-rev-stdin (2025-03-12) 6 commits
383
- - name-rev: remove "--stdin" support
384
- - t6120: further modernize
385
- - t6120: avoid hiding "git" exit status
386
- - t: introduce WITH_BREAKING_CHANGES prerequisite
387
- - t: extend test_lazy_prereq
388
- - t: document test_lazy_prereq
592
+ (merged to 'next' on 2025-03-24 at cfec2e409f)
593
+ + name-rev: remove "--stdin" support
594
+ + t6120: further modernize
595
+ + t6120: avoid hiding "git" exit status
596
+ + t: introduce WITH_BREAKING_CHANGES prerequisite
597
+ + t: extend test_lazy_prereq
598
+ + t: document test_lazy_prereq
599
600
Using "git name-rev --stdin" as an example, improve the framework to
601
prepare tests to pretend to be in the future where the breaking
602
changes have already happened.
603
394
- Will merge to 'next'.
604
+ Will merge to 'master'.
605
source: <20250311212505.2920181-1-gitster@pobox.com>
606
607
@@ -453,24 +663,24 @@ Release tarballs are available at:
663
664
665
* cc/lop-remote (2025-03-18) 4 commits
456
- - promisor-remote: compare remote names case sensitively
457
- - promisor-remote: fix possible issue when no URL is advertised
458
- - promisor-remote: fix segfault when remote URL is missing
459
- - t5710: arrange to delete the client before cloning
666
+ (merged to 'next' on 2025-03-24 at 3b685ceef0)
667
+ + promisor-remote: compare remote names case sensitively
668
+ + promisor-remote: fix possible issue when no URL is advertised
669
+ + promisor-remote: fix segfault when remote URL is missing
670
+ + t5710: arrange to delete the client before cloning
671
672
Bugfix in newly introduced large-object-promisor remote support.
673
463
- Will merge to 'next'.
674
+ Will merge to 'master'.
675
source: <20250318110008.656695-1-christian.couder@gmail.com>
676
677
678
* ps/ci-meson-check-build-docs (2025-03-12) 1 commit
679
- ci: perform build and smoke tests for Meson docs
469
- (this branch is used by jc/ci-meson-check-build-docs-fix.)
680
681
CI update.
682
473
- On hold waiting for the fix-up to settle.
683
+ Will merge to 'next'.
684
source: <20250312-b4-pks-ci-meson-docs-v1-1-5e7cf7ac959a@pks.im>
685
686
@@ -504,41 +714,17 @@ Release tarballs are available at:
714
source: <20250304113323.10564-1-kuforiji98@gmail.com>
715
716
507
-* dm/completion-remote-names-fix (2025-03-18) 2 commits
508
- - completion: fix bugs with slashes in remote names
509
- - completion: add helper to count path components
717
+* dm/completion-remote-names-fix (2025-03-23) 2 commits
718
+ (merged to 'next' on 2025-03-26 at b9460e20ae)
719
+ + completion: fix bugs with slashes in remote names
720
+ + completion: add helper to count path components
721
722
The bash command line completion script (in contrib/) has been
723
updated to cope with remote repository nicknames with slashes in
724
them.
725
515
- Will merge to 'next'.
516
- source: <1587533591c81d38977e62165784f8eb@mandelberg.org>
517
-
518
-
519
-* tb/refs-exclude-fixes (2025-03-06) 2 commits
520
- (merged to 'next' on 2025-03-06 at 50707f29db)
521
- + refs.c: stop matching non-directory prefixes in exclude patterns
522
- + refs.c: remove empty '--exclude' patterns
523
-
524
- The refname exclusion logic in the packed-ref backend has been
525
- broken for some time, which confused upload-pack to advertise
526
- different set of refs. This has been corrected.
527
-
528
- Will merge to 'master'.
529
- source: <cover.1741275245.git.me@ttaylorr.com>
530
-
531
-
532
-* en/merge-process-renames-crash-fix (2025-03-06) 2 commits
533
- (merged to 'next' on 2025-03-06 at 8f38331e32)
534
- + merge-ort: fix slightly overzealous assertion for rename-to-self
535
- + t6423: add a testcase causing a failed assertion in process_renames
536
-
537
- The merge-recursive and merge-ort machinery crashed in corner cases
538
- when certain renames are involved.
539
-
726
Will merge to 'master'.
541
- source: <pull.1873.git.1741275027.gitgitgadget@gmail.com>
727
+ source: <17274df2746d304db876ebd82ad8d932@mandelberg.org>
728
729
730
* kn/non-transactional-batch-updates (2025-03-21) 9 commits
@@ -584,25 +770,6 @@ Release tarballs are available at:
770
source: <20250310-b4-pks-objects-without-the-repository-v4-0-f201b8ec57ba@pks.im>
771
772
587
-* ua/some-builtins-wo-the-repository (2025-03-07) 8 commits
588
- (merged to 'next' on 2025-03-07 at 01f2b84529)
589
- + builtin/checkout-index: stop using `the_repository`
590
- + builtin/for-each-ref: stop using `the_repository`
591
- + builtin/ls-files: stop using `the_repository`
592
- + builtin/pack-refs: stop using `the_repository`
593
- + builtin/send-pack: stop using `the_repository`
594
- + builtin/verify-commit: stop using `the_repository`
595
- + builtin/verify-tag: stop using `the_repository`
596
- + config: teach repo_config to allow `repo` to be NULL
597
-
598
- A handful of built-in command implementations have been rewritten
599
- to use the repository instance supplied by git.c:run_builtin(), its
600
- caller.
601
-
602
- Will merge to 'master'.
603
- source: <20250307233543.1721552-1-usmanakinyemi202@gmail.com>
604
-
605
-
773
* ps/maintenance-reflog-expire (2025-02-26) 6 commits
774
- builtin/maintenance: introduce "reflog-expire" task
775
- builtin/gc: split out function to expire reflog entries
@@ -693,20 +860,6 @@ Release tarballs are available at:
860
source: <20250310155746.879481-1-christian.couder@gmail.com>
861
862
696
-* jt/diff-pairs (2025-03-03) 4 commits
697
- (merged to 'next' on 2025-03-03 at 32346e0c3b)
698
- + builtin/diff-pairs: allow explicit diff queue flush
699
- + builtin: introduce diff-pairs command
700
- + diff: add option to skip resolving diff statuses
701
- + diff: return diff_filepair from diff queue helpers
702
-
703
- A post-processing filter for "diff --raw" output has been
704
- introduced.
705
-
706
- Will merge to 'master'.
707
- source: <20250228213346.1335224-1-jltobler@gmail.com>
708
-
709
-
863
* ib/diff-S-G-with-longhand (2025-02-12) 10 commits
864
- diff: docs: Use --patch-{grep,modifies} over -G/-S
865
- diff: --pickaxe-{all,regex} help: Add --patch-{grep,modifies}
@@ -766,24 +919,6 @@ Release tarballs are available at:
919
source: <20250218-pks-reftable-drop-git-compat-util-v6-0-8c1f39fb4c02@pks.im>
920
921
769
-* sj/ref-consistency-checks-more (2025-02-27) 9 commits
770
- (merged to 'next' on 2025-03-05 at 6bea9376c4)
771
- + builtin/fsck: add `git refs verify` child process
772
- + packed-backend: check whether the "packed-refs" is sorted
773
- + packed-backend: add "packed-refs" entry consistency check
774
- + packed-backend: check whether the refname contains NUL characters
775
- + packed-backend: add "packed-refs" header consistency check
776
- + packed-backend: check if header starts with "# pack-refs with: "
777
- + packed-backend: check whether the "packed-refs" is regular file
778
- + builtin/refs: get worktrees without reading head information
779
- + t0602: use subshell to ensure working directory unchanged
780
-
781
- "git fsck" becomes more careful when checking the refs.
782
-
783
- Will merge to 'master'.
784
- source: <Z8CMx7O19PMs9sVY@ArchLinux>
785
-
786
-
922
* jc/doc-attr-tree (2024-12-14) 1 commit
923
- doc: give attr.tree a bit more visibility
924