What's cooking (2025/10 #05)
Junio C Hamano committed
Oct 14, 2025 at 14:42 UTC
5e05f96d9e92d287910f724e0228fdd2aeebba59
1 file changed
+237
-238
whats-cooking.txt
+237
-238
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2025, #04; Fri, 10)
3
-X-master-at: 4b71b294773cc4f7fe48ec3a70079aa8783f373d
4
-X-next-at: f9c4a03a3a780b23d84ed893d98c5c8141d26374
2
+Subject: What's cooking in git.git (Oct 2025, #05; Tue, 14)
3
+X-master-at: b660e2dcb98ed4eafe2781b7ba31b70d2fcbad80
4
+X-next-at: 61a8936c2151ce465d7d3286fe1d38bfb821753f
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Oct 2025, #04; Fri, 10)
7
+What's cooking in git.git (Oct 2025, #05; Tue, 14)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -21,6 +21,11 @@ Copies of the source code to Git live in many repositories, and the
21
following is a list of the ones I push into or their mirrors. Some
22
repositories have only a subset of branches.
23
24
+Since we have been seeing so many "I still use whatchanged" --
25
+"Well, log replaced it 12 yearas ago" exchanges, let's have a
26
+maintenance release 2.51.1 that updates the message when the
27
+deprecated command is used, among other things.
28
+
29
With maint, master, next, seen, todo:
30
31
git://git.kernel.org/pub/scm/git/git.git/
@@ -48,77 +53,240 @@ Release tarballs are available at:
53
--------------------------------------------------
54
[Graduated to 'master']
55
51
-* en/doc-merge-tree-describe-merge-base (2025-10-02) 1 commit
52
- (merged to 'next' on 2025-10-06 at 787ff6f08a)
53
- + Documentation/git-merge-tree.adoc: clarify the --merge-base option
56
+* en/xdiff-cleanup (2025-09-26) 12 commits
57
+ (merged to 'next' on 2025-10-08 at 5bc21d0f06)
58
+ + xdiff: change type of xdfile_t.changed from char to bool
59
+ + xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.c
60
+ + xdiff: rename rchg -> changed in xdfile_t
61
+ + xdiff: delete chastore from xdfile_t
62
+ + xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t
63
+ + xdiff: delete redundant array xdfile_t.ha
64
+ + xdiff: delete struct diffdata_t
65
+ + xdiff: delete local variables that alias fields in xrecord_t
66
+ + xdiff: delete superfluous function xdl_get_rec() in xemit
67
+ + xdiff: delete unnecessary fields from xrecord_t and xdfile_t
68
+ + xdiff: delete local variables and initialize/free xdfile_t directly
69
+ + xdiff: delete static forward declarations in xprepare
70
+
71
+ A lot of code clean-up of xdiff.
72
+ Split out of a larger topic.
73
+ source: <pull.2048.v6.git.git.1758926520.gitgitgadget@gmail.com>
74
+
75
+
76
+* ja/doc-markup-attached-paragraph-fix (2025-10-07) 2 commits
77
+ (merged to 'next' on 2025-10-07 at 5b991a7b14)
78
+ + doc: fix indentation of refStorage item in git-config(1)
79
+ (merged to 'next' on 2025-09-30 at a91ca5db03)
80
+ + doc: change the markup of paragraphs following a nested list item
81
+
82
+ Documentation mark-up fix.
83
+ source: <20250927195032.37223-1-jn.avila@free.fr>
84
+ source: <20251007082223.GA3336685@coredump.intra.peff.net>
85
+
86
+
87
+* jc/optional-path (2025-09-28) 4 commits
88
+ (merged to 'next' on 2025-10-08 at a1e8af9952)
89
+ + parseopt: values of pathname type can be prefixed with :(optional)
90
+ + config: values of pathname type can be prefixed with :(optional)
91
+ + t7500: fix GIT_EDITOR shell snippet
92
+ + t7500: make each piece more independent
93
+
94
+ Configuration variables that take a pathname as a value
95
+ (e.g. blame.ignorerevsfile) can be marked as optional by prefixing
96
+ ":(optoinal)" before its value.
97
+ source: <cover.1759094936.git.ben.knoble+github@gmail.com>
98
+
99
+
100
+* je/doc-push-upstream (2025-10-06) 5 commits
101
+ (merged to 'next' on 2025-10-08 at 7bda6929b1)
102
+ + doc: git-push: add explanation of `git push origin main`
103
+ + doc: git-push: clarify "what to push"
104
+ + doc: git-push: clarify "where to push"
105
+ + doc: add an UPSTREAM BRANCHES section to pull/push/fetch
106
+ + doc: git-push: clarify intro
107
55
- Clarify the "--merge-base" command line option in "git merge-tree".
56
-
57
- source: <pull.1980.git.1759444487406.gitgitgadget@gmail.com>
108
+ Documentation updates.
109
+ source: <pull.1964.v5.git.1759777131.gitgitgadget@gmail.com>
110
111
60
-* ps/gitlab-ci-windows-improvements (2025-10-02) 5 commits
61
- (merged to 'next' on 2025-10-03 at 6adb054d12)
62
- + t8020: fix test failure due to indeterministic tag sorting
63
- + gitlab-ci: upload Meson test logs as JUnit reports
64
- + gitlab-ci: drop workaround for Python certificate store on Windows
65
- + gitlab-ci: ignore failures to disable realtime monitoring
66
- + gitlab-ci: dedup instructions to disable realtime monitoring
67
- (this branch is used by ps/ci-rust.)
112
+* jn/doc-help-translaing-pretty-options (2025-10-05) 1 commit
113
+ (merged to 'next' on 2025-10-08 at 8962b8d1f0)
114
+ + doc: do not break sentences into "lego" pieces
115
69
- GitLab CI improvements.
70
-
71
- source: <20251002-pks-gitlab-ci-windows-improvements-v1-0-6a8b6b45d728@pks.im>
116
+ Documentation for "git log --pretty" options has been updated
117
+ to make it easier to translate.
118
+ source: <pull.1982.git.1759698724134.gitgitgadget@gmail.com>
119
120
74
-* rj/doc-missing-technical-docs (2025-10-02) 1 commit
75
- (merged to 'next' on 2025-10-06 at f639955fdc)
76
- + doc: add some missing technical documents
77
- (this branch is used by rj/doc-technical-fixes.)
121
+* jn/doc-synopsis (2025-10-05) 3 commits
122
+ (merged to 'next' on 2025-10-08 at fd4f96ff5e)
123
+ + doc: convert git worktree to synopsis style
124
+ + doc: convert git tag to synopsis style
125
+ + doc: convert git-stash.adoc to synopis style
126
+
127
+ Doc-mark-up modernization continues.
128
+ source: <pull.1969.git.1759698702.gitgitgadget@gmail.com>
129
79
- Doc updates.
80
-
81
- source: <20251002221233.541844-2-ramsay@ramsayjones.plus.com>
130
+
131
+* kh/doc-patch-id-markup-fix (2025-09-29) 1 commit
132
+ (merged to 'next' on 2025-10-08 at a81dc9f7e6)
133
+ + doc: patch-id: fix accidental literal blocks
134
+ (this branch is used by kh/doc-patch-id-1.)
135
+
136
+ Documentation mark-up fix.
137
+ source: <v2-e5ad12cc3b3.1759178715.git.code@khaugsbakk.name>
138
+
139
+
140
+* kh/format-patch-range-diff-notes (2025-09-25) 3 commits
141
+ (merged to 'next' on 2025-10-08 at e06aae4166)
142
+ + format-patch: handle range-diff on notes correctly for single patches
143
+ + revision: add rdiff_log_arg to rev_info
144
+ + range-diff: rename other_arg to log_arg
145
+
146
+ "git format-patch --range-diff=... --notes=..." did not drive the
147
+ underlying range-diff with correct --notes parameter, ending up
148
+ comparing with different set of notes from its main patch output
149
+ you would get from "git format-patch --notes=..." for a singleton
150
+ patch.
151
+ source: <v2-cover.1758819879.git.code@khaugsbakk.name>
152
+
153
+
154
+* kn/reftable-consistency-checks (2025-10-07) 7 commits
155
+ (merged to 'next' on 2025-10-07 at b9f4bd79f9)
156
+ + refs/reftable: add fsck check for checking the table name
157
+ + reftable: add code to facilitate consistency checks
158
+ + fsck: order 'fsck_msg_type' alphabetically
159
+ + Documentation/fsck-msgids: remove duplicate msg id
160
+ + reftable: check for trailing newline in 'tables.list'
161
+ + refs: move consistency check msg to generic layer
162
+ + refs: remove unused headers
163
+
164
+ The reftable backend learned to sanity check its on-disk data more
165
+ carefully.
166
+ source: <20251007-228-reftable-introduce-consistency-checks-v6-0-638cff42f0b0@gmail.com>
167
+
168
+
169
+* ps/ci-avoid-broken-sudo-on-ubuntu (2025-10-10) 1 commit
170
+ (merged to 'next' on 2025-10-13 at fd60b6d14b)
171
+ + ci: fix broken jobs on Ubuntu 25.10 caused by switch to sudo-rs(1)
172
+
173
+ Our CI script requires "sudo" that can be told to preserve
174
+ environment, but Ubuntu replaced with "sudo" with an implementation
175
+ that lacks the feature. Work this around by reinstalling the
176
+ original version.
177
+ source: <20251010-b4-pks-ci-ubuntu-sudo-rs-v1-1-88cc846d251c@pks.im>
178
+
179
+
180
+* ps/commit-graph-per-object-source (2025-09-04) 5 commits
181
+ (merged to 'next' on 2025-10-07 at 6c9690a649)
182
+ + commit-graph: pass graphs that are to be merged as parameter
183
+ + commit-graph: return commit graph from `repo_find_commit_pos_in_graph()`
184
+ + commit-graph: return the prepared commit graph from `prepare_commit_graph()`
185
+ + revision: drop explicit check for commit graph
186
+ + blame: drop explicit check for commit graph
187
+
188
+ Code clean-up around commit-graph.
189
+ cf. <cf7aeda1-297a-4805-b0ae-e379ce11bbcf@gmail.com>
190
+ cf. <aN5gPoPC4WEYw9CF@pks.im>
191
+ source: <20250904-b4-pks-commit-graph-via-source-v1-0-d932c2481e1a@pks.im>
192
+
193
+
194
+* pw/add-p-hunk-splitting-fix (2025-09-25) 2 commits
195
+ (merged to 'next' on 2025-10-08 at 3fdb4a84ce)
196
+ + add-patch: update hunk splitability after editing
197
+ + add -p: mark split hunks as undecided
198
+
199
+ Marking a hunk 'selected' in "git add -p" and then splitting made
200
+ all the split pieces 'selected'; this has been changed to make them
201
+ all 'undecided', which gives better end-user experience.
202
+ source: <pull.1863.v3.git.1758813038.gitgitgadget@gmail.com>
203
+
204
+
205
+* sj/string-list (2025-10-05) 4 commits
206
+ (merged to 'next' on 2025-10-08 at cf0fc3ea18)
207
+ + refs: enable sign compare warnings check
208
+ + string-list: change "string_list_find_insert_index" return type to "size_t"
209
+ + string-list: replace negative index encoding with "exact_match" parameter
210
+ + string-list: use bool instead of int for "exact_match"
211
+
212
+ The "string-list" API function to find where a given string would
213
+ be inserted got updated so that it can use unrealistically huge
214
+ array index that would only fit in size_t but not int or ssize_t
215
+ to achieve unstated goal.
216
+ source: <aONhmrE0otiyZ16f@ArchLinux>
217
218
--------------------------------------------------
219
[New Topics]
220
221
+* tu/credential-makefile-updates (2025-10-10) 1 commit
222
+ - contrib/credential: Amend and harmonize Makefiles
223
+
224
+ Build procedure for a few credential helpers (in contrib/) have
225
+ been updated.
226
+
227
+ Expecting a reroll.
228
+ source: <48d92664-41af-bb59-1844-7bb57f21924f@mailbox.tu-dresden.de>
229
+
230
+
231
+* tb/cat-file-objectmode-update (2025-10-13) 1 commit
232
+ (merged to 'next' on 2025-10-13 at 4fd0f1b5b5)
233
+ + builtin/cat-file.c: simplify calling `report_object_status()`
234
+
235
+ Code clean-up.
236
+
237
+ Will merge to 'master'.
238
+ source: <9236fa6e654a59337266430a2a8807da21210cd4.1760392502.git.me@ttaylorr.com>
239
+
240
+
241
+* ps/symlink-symref-deprecation (2025-10-14) 1 commit
242
+ - refs/files: deprecate writing symrefs as symbolic links
243
+
244
+ "Symlink symref" has been added to the list of things that will
245
+ disappear at Git 3.0 boundary.
246
+
247
+ Comments?
248
+ source: <20251014-pks-ref-files-deprecate-symbolic-links-v1-1-4bcd6a4ef6f5@pks.im>
249
+
250
+--------------------------------------------------
251
+[Cooking]
252
+
253
* dk/stash-apply-index (2025-10-06) 1 commit
87
- - doc: explain the impact of stash.index on --autostash options
254
+ (merged to 'next' on 2025-10-13 at 2187046f6c)
255
+ + doc: explain the impact of stash.index on --autostash options
256
257
Doc update.
258
91
- Will merge to 'next'.
259
+ Will merge to 'master'.
260
source: <d4a277b6b0695d86636562f4c07efae17f9249f9.1759755379.git.ben.knoble+github@gmail.com>
261
262
263
* js/mingw-includes-cleanup (2025-10-09) 2 commits
96
- - mingw: order `#include`s alphabetically
97
- - mingw: avoid relative `#include`s
264
+ (merged to 'next' on 2025-10-13 at b7144c1feb)
265
+ + mingw: order `#include`s alphabetically
266
+ + mingw: avoid relative `#include`s
267
268
Code clean-up.
269
101
- Will merge to 'next'.
270
+ Will merge to 'master'.
271
source: <pull.1985.git.1759995961.gitgitgadget@gmail.com>
272
273
274
* js/unreachable-workaround-for-no-symlink-head (2025-10-09) 1 commit
106
- - refs: forbid clang to complain about unreachable code
275
+ (merged to 'next' on 2025-10-13 at 0e970d5e4e)
276
+ + refs: forbid clang to complain about unreachable code
277
278
Code clean-up.
279
110
- Will merge to 'next'.
280
+ Will merge to 'master'.
281
source: <pull.1984.git.1759995982220.gitgitgadget@gmail.com>
282
283
114
-* kh/doc-patch-id-1 (2025-10-09) 2 commits
284
+* kh/doc-patch-id-1 (2025-10-13) 2 commits
285
- doc: patch-id: convert to the modern synopsis style
286
- Merge branch 'kh/doc-patch-id-markup-fix' into kh/doc-patch-id-1
117
- (this branch uses kh/doc-patch-id-markup-fix.)
287
119
- Expecting a reroll.
120
- cf. <d0dcaea3-844f-497a-adca-6241bf39db41@free.fr>
121
- source: <978261e3be4.1760043036.git.code@khaugsbakk.name>
288
+ Will merge to 'next'?
289
+ source: <v2-38645ea253c.1760369708.git.code@khaugsbakk.name>
290
291
292
* tz/test-prepare-gnupghome (2024-07-03) 2 commits
@@ -143,18 +311,18 @@ Release tarballs are available at:
311
Comments?
312
source: <xmqqsefq7947.fsf@gitster.g>
313
314
+
315
* kh/doc-continued-paragraph-fix (2025-10-08) 1 commit
147
- - doc: fix accidental literal blocks
316
+ (merged to 'next' on 2025-10-13 at e66316f041)
317
+ + doc: fix accidental literal blocks
318
319
Doc mark-up fixes.
320
151
- Will merge to 'next'.
321
+ Will merge to 'master'.
322
source: <7a955ecb1b5.1759923933.git.code@khaugsbakk.name>
323
154
---------------------------------------------------
155
-[Cooking]
324
157
-* cc/fast-import-strip-signed-tags (2025-10-09) 5 commits
325
+* cc/fast-import-strip-signed-tags (2025-10-13) 5 commits
326
- fast-import: add '--signed-tags=<mode>' option
327
- fast-export: handle all kinds of tag signatures
328
- t9350: properly count annotated tags
@@ -164,9 +332,8 @@ Release tarballs are available at:
332
"git fast-import" is taught to handle signed tags, just like it
333
recently learned to handle signed commits, in different ways.
334
167
- Expecting v3.
168
- cf. <CAP8UFD10eMwKdacEzLumdXUghV2nYZViDT4o44u1qgXVU5Pzew@mail.gmail.com>
169
- source: <20251009122457.1273701-1-christian.couder@gmail.com>
335
+ Will merge to 'next'?
336
+ source: <20251013084857.1646783-1-christian.couder@gmail.com>
337
338
339
* ps/ci-rust (2025-10-07) 8 commits
@@ -260,29 +427,6 @@ Release tarballs are available at:
427
source: <fe8e8097-2b05-4dd2-a754-f59e4ba5f95a@web.de>
428
429
263
-* jn/doc-help-translaing-pretty-options (2025-10-05) 1 commit
264
- (merged to 'next' on 2025-10-08 at 8962b8d1f0)
265
- + doc: do not break sentences into "lego" pieces
266
-
267
- Documentation for "git log --pretty" options has been updated
268
- to make it easier to translate.
269
-
270
- Will merge to 'master'.
271
- source: <pull.1982.git.1759698724134.gitgitgadget@gmail.com>
272
-
273
-
274
-* jn/doc-synopsis (2025-10-05) 3 commits
275
- (merged to 'next' on 2025-10-08 at fd4f96ff5e)
276
- + doc: convert git worktree to synopsis style
277
- + doc: convert git tag to synopsis style
278
- + doc: convert git-stash.adoc to synopis style
279
-
280
- Doc-mark-up modernization continues.
281
-
282
- Will merge to 'master'.
283
- source: <pull.1969.git.1759698702.gitgitgadget@gmail.com>
284
-
285
-
430
* tb/incremental-midx-part-3.1 (2025-09-29) 51 commits
431
- SQUASH??? play well with other topics by preemptively including "repository.h"
432
- builtin/repack.c: clean up unused `#include`s
@@ -368,6 +512,8 @@ Release tarballs are available at:
512
(this branch uses sa/replay-atomic-ref-updates.)
513
514
"git history" history rewriting UI.
515
+
516
+ Stomps on each others toes with sa/replay-atomic-ref-updates topic.
517
source: <20251001-b4-pks-history-builtin-v4-0-8e61ddb86317@pks.im>
518
519
@@ -391,7 +537,8 @@ Release tarballs are available at:
537
Document "git worktree add" and use of out-of-tree worktrees with
538
examples.
539
394
- Will merge to 'next'?
540
+ Under discussion.
541
+ cf. <CAPig+cSNesf0UwS4=Bxe-Qn+G9y3YYPyOK+7y3q8QJk+o7jaVg@mail.gmail.com>
542
source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>
543
544
@@ -402,75 +549,24 @@ Release tarballs are available at:
549
550
Documentation mark-up fixes.
551
405
- Expecting v3.
552
+ Expecting v3.
553
cf. <20251002221233.541844-1-ramsay@ramsayjones.plus.com>
554
source: <20251002221233.541844-1-ramsay@ramsayjones.plus.com>
555
556
410
-* ja/doc-markup-attached-paragraph-fix (2025-10-07) 2 commits
411
- (merged to 'next' on 2025-10-07 at 5b991a7b14)
412
- + doc: fix indentation of refStorage item in git-config(1)
413
- (merged to 'next' on 2025-09-30 at a91ca5db03)
414
- + doc: change the markup of paragraphs following a nested list item
415
-
416
- Documentation mark-up fix.
417
- source: <20250927195032.37223-1-jn.avila@free.fr>
418
- source: <20251007082223.GA3336685@coredump.intra.peff.net>
419
-
420
-
421
-* jc/optional-path (2025-09-28) 4 commits
422
- (merged to 'next' on 2025-10-08 at a1e8af9952)
423
- + parseopt: values of pathname type can be prefixed with :(optional)
424
- + config: values of pathname type can be prefixed with :(optional)
425
- + t7500: fix GIT_EDITOR shell snippet
426
- + t7500: make each piece more independent
427
-
428
- Configuration variables that take a pathname as a value
429
- (e.g. blame.ignorerevsfile) can be marked as optional by prefixing
430
- ":(optoinal)" before its value.
431
-
432
- Will merge to 'master'.
433
- source: <cover.1759094936.git.ben.knoble+github@gmail.com>
434
-
435
-
436
-* kh/doc-patch-id-markup-fix (2025-09-29) 1 commit
437
- (merged to 'next' on 2025-10-08 at a81dc9f7e6)
438
- + doc: patch-id: fix accidental literal blocks
439
- (this branch is used by kh/doc-patch-id-1.)
440
-
441
- Documentation mark-up fix.
442
-
443
- Will merge to 'master'.
444
- source: <v2-e5ad12cc3b3.1759178715.git.code@khaugsbakk.name>
445
-
446
-
447
-* sa/replay-atomic-ref-updates (2025-09-26) 1 commit
557
+* sa/replay-atomic-ref-updates (2025-10-14) 4 commits
558
+ - SQAUASH??? t0450 band-aid
559
+ - replay: add replay.defaultAction config option
560
- replay: make atomic ref updates the default behavior
561
+ - replay: use die_for_incompatible_opt2() for option validation
562
(this branch is used by ps/history.)
563
564
"git replay" (experimental) learned to perform ref updates itself
565
in a transaction by default, instead of emitting where each refs
566
should point at and leaving the actual update to another command.
567
455
- Expecting v3.
456
- cf. <64b63d62-482d-42b2-8090-60aac8f505d4@gmail.com>
457
- source: <20250926230838.35870-2-siddharthasthana31@gmail.com>
458
-
459
-
460
-* kh/format-patch-range-diff-notes (2025-09-25) 3 commits
461
- (merged to 'next' on 2025-10-08 at e06aae4166)
462
- + format-patch: handle range-diff on notes correctly for single patches
463
- + revision: add rdiff_log_arg to rev_info
464
- + range-diff: rename other_arg to log_arg
465
-
466
- "git format-patch --range-diff=... --notes=..." did not drive the
467
- underlying range-diff with correct --notes parameter, ending up
468
- comparing with different set of notes from its main patch output
469
- you would get from "git format-patch --notes=..." for a singleton
470
- patch.
471
-
472
- Will merge to 'master'.
473
- source: <v2-cover.1758819879.git.code@khaugsbakk.name>
568
+ Expecting a reroll.
569
+ source: <20251013183311.33329-1-siddharthasthana31@gmail.com>
570
571
572
* je/doc-pull (2025-10-08) 4 commits
@@ -485,20 +581,6 @@ Release tarballs are available at:
581
source: <pull.1976.v2.git.1759951536.gitgitgadget@gmail.com>
582
583
488
-* je/doc-push-upstream (2025-10-06) 5 commits
489
- (merged to 'next' on 2025-10-08 at 7bda6929b1)
490
- + doc: git-push: add explanation of `git push origin main`
491
- + doc: git-push: clarify "what to push"
492
- + doc: git-push: clarify "where to push"
493
- + doc: add an UPSTREAM BRANCHES section to pull/push/fetch
494
- + doc: git-push: clarify intro
495
-
496
- Documentation updates.
497
-
498
- Will merge to 'master'.
499
- source: <pull.1964.v5.git.1759777131.gitgitgadget@gmail.com>
500
-
501
-
584
* jk/diff-no-index-with-pathspec-fix (2025-09-24) 1 commit
585
(merged to 'next' on 2025-10-10 at 75721dbc16)
586
+ diff --no-index: fix logic for paths ending in '/'
@@ -526,73 +608,22 @@ Release tarballs are available at:
608
source: <20250927145049.723341-1-jltobler@gmail.com>
609
610
529
-* kn/reftable-consistency-checks (2025-10-07) 7 commits
530
- (merged to 'next' on 2025-10-07 at b9f4bd79f9)
531
- + refs/reftable: add fsck check for checking the table name
532
- + reftable: add code to facilitate consistency checks
533
- + fsck: order 'fsck_msg_type' alphabetically
534
- + Documentation/fsck-msgids: remove duplicate msg id
535
- + reftable: check for trailing newline in 'tables.list'
536
- + refs: move consistency check msg to generic layer
537
- + refs: remove unused headers
538
-
539
- The reftable backend learned to sanity check its on-disk data more
540
- carefully.
541
-
542
- Will merge to 'master'.
543
- source: <20251007-228-reftable-introduce-consistency-checks-v6-0-638cff42f0b0@gmail.com>
544
-
545
-
611
* bc/sha1-256-interop-01 (2025-10-09) 9 commits
547
- - t1010: use BROKEN_OBJECTS prerequisite
548
- - t: allow specifying compatibility hash
549
- - fsck: consider gpgsig headers expected in tags
550
- - rev-parse: allow printing compatibility hash
551
- - docs: add documentation for loose objects
552
- - docs: improve ambiguous areas of pack format documentation
553
- - docs: reflect actual double signature for tags
554
- - docs: update offset order for pack index v3
555
- - docs: update pack index v3 format
612
+ (merged to 'next' on 2025-10-14 at c571bab975)
613
+ + t1010: use BROKEN_OBJECTS prerequisite
614
+ + t: allow specifying compatibility hash
615
+ + fsck: consider gpgsig headers expected in tags
616
+ + rev-parse: allow printing compatibility hash
617
+ + docs: add documentation for loose objects
618
+ + docs: improve ambiguous areas of pack format documentation
619
+ + docs: reflect actual double signature for tags
620
+ + docs: update offset order for pack index v3
621
+ + docs: update pack index v3 format
622
623
The beginning of SHA1-SHA256 interoperability work.
624
559
- Will merge to 'next'?
560
- source: <20251009215626.3089287-1-sandals@crustytoothpaste.net>
561
-
562
-
563
-* pw/add-p-hunk-splitting-fix (2025-09-25) 2 commits
564
- (merged to 'next' on 2025-10-08 at 3fdb4a84ce)
565
- + add-patch: update hunk splitability after editing
566
- + add -p: mark split hunks as undecided
567
-
568
- Marking a hunk 'selected' in "git add -p" and then splitting made
569
- all the split pieces 'selected'; this has been changed to make them
570
- all 'undecided', which gives better end-user experience.
571
-
625
Will merge to 'master'.
573
- source: <pull.1863.v3.git.1758813038.gitgitgadget@gmail.com>
574
-
575
-
576
-* en/xdiff-cleanup (2025-09-26) 12 commits
577
- (merged to 'next' on 2025-10-08 at 5bc21d0f06)
578
- + xdiff: change type of xdfile_t.changed from char to bool
579
- + xdiff: add macros DISCARD(0), KEEP(1), INVESTIGATE(2) in xprepare.c
580
- + xdiff: rename rchg -> changed in xdfile_t
581
- + xdiff: delete chastore from xdfile_t
582
- + xdiff: delete fields ha, line, size in xdlclass_t in favor of an xrecord_t
583
- + xdiff: delete redundant array xdfile_t.ha
584
- + xdiff: delete struct diffdata_t
585
- + xdiff: delete local variables that alias fields in xrecord_t
586
- + xdiff: delete superfluous function xdl_get_rec() in xemit
587
- + xdiff: delete unnecessary fields from xrecord_t and xdfile_t
588
- + xdiff: delete local variables and initialize/free xdfile_t directly
589
- + xdiff: delete static forward declarations in xprepare
590
-
591
- A lot of code clean-up of xdiff.
592
- Split out of a larger topic.
593
-
594
- Will merge to 'master'.
595
- source: <pull.2048.v6.git.git.1758926520.gitgitgadget@gmail.com>
626
+ source: <20251009215626.3089287-1-sandals@crustytoothpaste.net>
627
628
629
* ar/submodule-gitdir-tweak (2025-10-06) 5 commits
@@ -611,38 +642,6 @@ Release tarballs are available at:
642
source: <20251006112518.3764240-1-adrian.ratiu@collabora.com>
643
644
614
-* ps/commit-graph-per-object-source (2025-09-04) 5 commits
615
- (merged to 'next' on 2025-10-07 at 6c9690a649)
616
- + commit-graph: pass graphs that are to be merged as parameter
617
- + commit-graph: return commit graph from `repo_find_commit_pos_in_graph()`
618
- + commit-graph: return the prepared commit graph from `prepare_commit_graph()`
619
- + revision: drop explicit check for commit graph
620
- + blame: drop explicit check for commit graph
621
-
622
- Code clean-up around commit-graph.
623
-
624
- Will merge to 'master'.
625
- cf. <cf7aeda1-297a-4805-b0ae-e379ce11bbcf@gmail.com>
626
- cf. <aN5gPoPC4WEYw9CF@pks.im>
627
- source: <20250904-b4-pks-commit-graph-via-source-v1-0-d932c2481e1a@pks.im>
628
-
629
-
630
-* sj/string-list (2025-10-05) 4 commits
631
- (merged to 'next' on 2025-10-08 at cf0fc3ea18)
632
- + refs: enable sign compare warnings check
633
- + string-list: change "string_list_find_insert_index" return type to "size_t"
634
- + string-list: replace negative index encoding with "exact_match" parameter
635
- + string-list: use bool instead of int for "exact_match"
636
-
637
- The "string-list" API function to find where a given string would
638
- be inserted got updated so that it can use unrealistically huge
639
- array index that would only fit in size_t but not int or ssize_t
640
- to achieve unstated goal.
641
-
642
- Will merge to 'master'.
643
- source: <aONhmrE0otiyZ16f@ArchLinux>
644
-
645
-
645
* ds/sparse-checkout-clean (2025-09-12) 7 commits
646
(merged to 'next' on 2025-09-25 at 00b296f153)
647
+ t: expand tests around sparse merges and clean