What's cooking (2025/11 #09)
Junio C Hamano committed
Nov 28, 2025 at 17:43 UTC
34b72f4dba30a7751a1f7cf78cf88e6f1ceea362
1 file changed
+184
-241
whats-cooking.txt
+184
-241
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2025, #08; Tue, 25)
3
-X-master-at: 6ab38b7e9cc7adafc304f3204616a4debd49c6e9
4
-X-next-at: 9f829587aff1b6c6d7a88078af6c6011bf5bcd19
2
+Subject: What's cooking in git.git (Nov 2025, #09; Fri, 28)
3
+X-master-at: b31ab939fe8e3cbe8be48dddd1c6ac0265991f45
4
+X-next-at: f5cc29aaa48b979583a3fbe972e9795efbe8d134
5
Bcc: lwn@lwn.net, gitster@pobox.com
6
7
-What's cooking in git.git (Nov 2025, #08; Tue, 25)
7
+What's cooking in git.git (Nov 2025, #09; Fri, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking in my tree. Commits
@@ -48,118 +48,182 @@ Release tarballs are available at:
48
--------------------------------------------------
49
[Graduated to 'master']
50
51
-* bc/submodule-force-same-hash (2025-11-14) 2 commits
52
- (merged to 'next' on 2025-11-19 at eec9dca32c)
53
- + read-cache: drop submodule check from add_to_cache()
54
- + object-file: disallow adding submodules of different hash algo
51
+* ad/blame-diff-algorithm (2025-11-17) 2 commits
52
+ (merged to 'next' on 2025-11-19 at e1e456469f)
53
+ + blame: make diff algorithm configurable
54
+ + xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
55
56
- Originally merged to 'next' on 2025-11-16
56
+ "git blame" learns "--diff-algorithm=<algo>" option.
57
+ cf. <fd03f2a5-bf9e-453f-97d1-d5a66bc87470@gmail.com>
58
+ source: <pull.2075.v6.git.git.1763366672.gitgitgadget@gmail.com>
59
58
- Adding a repository that uses a different hash function is a no-no,
59
- but "git submodule add" didn't prevent it, which has been corrected.
60
- source: <20251112235434.1499699-1-sandals@crustytoothpaste.net>
60
61
+* en/ort-rename-another-fix (2025-11-03) 3 commits
62
+ (merged to 'next' on 2025-11-19 at 53d94af6b4)
63
+ + merge-ort: fix failing merges in special corner case
64
+ + merge-ort: remove debugging crud
65
+ + t6429: update comment to mention correct tool
66
63
-* jk/attr-macroexpand-wo-recursion (2025-11-11) 1 commit
64
- (merged to 'next' on 2025-11-19 at 5d5f74f4f0)
65
- + attr: avoid recursion when expanding attribute macros
67
+ Yet another corner case fix around renames in the "ort" merge
68
+ strategy.
69
+ source: <pull.1992.git.1762192908.gitgitgadget@gmail.com>
70
67
- Originally merged to 'next' on 2025-11-16
71
69
- The code to expand attribute macros has been rewritten without
70
- recursion to avoid running out of stack space in an uncontrolled
71
- way.
72
- source: <20251111223647.GA4055973@coredump.intra.peff.net>
72
+* gf/win32-pthread-cond-wait-err (2025-11-18) 1 commit
73
+ (merged to 'next' on 2025-11-21 at 89d9e04f91)
74
+ + win32: return error if SleepConditionVariableCS fails
75
76
+ Emulation code clean-up.
77
+ source: <pull.2104.v2.git.git.1763480514065.gitgitgadget@gmail.com>
78
75
-* jx/repo-struct-utf8width-fix (2025-11-15) 2 commits
76
- (merged to 'next' on 2025-11-19 at 35bff72b75)
77
- + builtin/repo: fix table alignment for UTF-8 characters
78
- + t/unit-tests: add UTF-8 width tests for CJK chars
79
80
- Originally merged to 'next' on 2025-11-18
80
+* jk/ci-windows-meson-test-fix (2025-11-18) 2 commits
81
+ (merged to 'next' on 2025-11-20 at a0afd4fd5b)
82
+ + ci(windows-meson-test): handle options and output like other test jobs
83
+ + unit-test: ignore --no-chain-lint
84
82
- The "git repo structure" subcommand tried to align its output but
83
- mixed up byte count and display column width, which has been
85
+ "Windows+meson" job at the GitHub Actions CI was hard to debug, as
86
+ it did not show and save failed test artifacts, which has been
87
corrected.
85
- source: <cover.1763213290.git.worldhello.net@gmail.com>
88
+ source: <20251118093221.GA530337@coredump.intra.peff.net>
89
90
88
-* kh/doc-commit-extra-references (2025-11-14) 1 commit
89
- (merged to 'next' on 2025-11-19 at 9c89891116)
90
- + doc: commit: link to git-status(1) on all format options
91
+* jk/test-mktemp-leakfix (2025-11-18) 1 commit
92
+ (merged to 'next' on 2025-11-19 at 1da34f8b26)
93
+ + test-mktemp: plug memory and descriptor leaks
94
+
95
+ Test leakfix.
96
+ source: <20251118122124.GA1117960@coredump.intra.peff.net>
97
92
- Originally merged to 'next' on 2025-11-18
98
94
- Doc update.
95
- source: <c4349a03724.1763129061.git.code@khaugsbakk.name>
99
+* js/ci-github-setup-go-update (2025-11-17) 1 commit
100
+ (merged to 'next' on 2025-11-19 at 9922384c2b)
101
+ + ci: bump actions/setup-go from 5 to 6
102
103
+ Update a version of action used at the GitHub Actrions CI.
104
+ source: <ebc68ec5b2abbc4702b94f833b9b3bf1adb79f1a.1763450087.git.zhiyou.jx@alibaba-inc.com>
105
98
-* kn/osxkeychain-idempotent-store-fix (2025-11-13) 1 commit
99
- (merged to 'next' on 2025-11-19 at 335d6bb2ea)
100
- + osxkeychain: avoid incorrectly skipping store operation
106
102
- Originally merged to 'next' on 2025-11-18
107
+* js/cmake-libgit-fix (2025-11-17) 1 commit
108
+ (merged to 'next' on 2025-11-19 at 1593640ab0)
109
+ + cmake: stop trying to build the reftable and xdiff libraries
110
104
- An earlier check added to osx keychain credential helper to avoid
105
- storing the credential itself supplied was overeager and rejected
106
- credential material supplied by other helper backends that it would
107
- have wanted to store, which has been corrected.
108
- source: <pull.1999.v2.git.1763100270949.gitgitgadget@gmail.com>
111
+ Makefile based build have recently been updated to build a
112
+ libgit.a that also has reftable and xdiff objects; CMake based
113
+ build procedure has been updated to match.
114
+ source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com>
115
116
111
-* ps/object-source-loose (2025-11-02) 13 commits
112
- (merged to 'next' on 2025-11-19 at 8bb0269243)
113
- + object-file: refactor writing objects via a stream
114
- + object-file: rename `write_object_file()`
115
- + object-file: refactor freshening of objects
116
- + object-file: rename `has_loose_object()`
117
- + object-file: read objects via the loose object source
118
- + object-file: move loose object map into loose source
119
- + object-file: hide internals when we need to reprepare loose sources
120
- + object-file: move loose object cache into loose source
121
- + object-file: introduce `struct odb_source_loose`
122
- + object-file: move `fetch_if_missing`
123
- + odb: adjust naming to free object sources
124
- + odb: introduce `odb_source_new()`
125
- + odb: fix subtle logic to check whether an alternate is usable
126
- (this branch is used by ps/object-read-stream and ps/object-source-management.)
117
+* js/mingw-assign-comma-fix (2025-11-17) 1 commit
118
+ (merged to 'next' on 2025-11-19 at d1a5807e11)
119
+ + mingw: avoid the comma operator
120
128
- Originally merged to 'next' on 2025-11-18
121
+ The "return errno = EFOO, -1" construct, which is heavily used in
122
+ compat/mingw.c and triggers warnings under "-Wcomma", has been
123
+ rewritten to avoid the warnings.
124
+ source: <pull.2007.git.1763412374866.gitgitgadget@gmail.com>
125
130
- A part of the code path that deals with loose objects has been cleaned
131
- up.
132
- source: <20251103-b4-pks-odb-loose-backend-v3-0-6a61ea977393@pks.im>
126
127
+* js/wincred-get-credential-alloc-fix (2025-11-17) 1 commit
128
+ (merged to 'next' on 2025-11-19 at 4c43c53c49)
129
+ + wincred: avoid memory corruption
130
135
-* qj/doc-http-bad-want-response (2025-11-05) 1 commit
136
- (merged to 'next' on 2025-11-19 at a602cd96eb)
137
- + doc: clarify server behavior for invalid 'want' lines in HTTP protocol
131
+ Under-allocation fix.
132
+ source: <pull.2005.git.1763411984773.gitgitgadget@gmail.com>
133
139
- Originally merged to 'next' on 2025-11-18
134
141
- Doc update.
142
- source: <20251105143849.1192-1-qjessa662@gmail.com>
135
+* pw/worktree-list-display-width-fix (2025-11-18) 2 commits
136
+ (merged to 'next' on 2025-11-20 at 3a341524cb)
137
+ + worktree list: quote paths
138
+ + worktree list: fix column spacing
139
140
+ "git worktree list" attempts to show paths to worktrees while
141
+ aligning them, but miscounted display columns for the paths when
142
+ non-ASCII characters were involved, which has been corrected.
143
+ source: <cover.1763482051.git.phillip.wood@dunelm.org.uk>
144
145
-* sa/replay-atomic-ref-updates (2025-11-05) 3 commits
146
- (merged to 'next' on 2025-11-19 at ae19b06a22)
147
- + replay: add replay.refAction config option
148
- + replay: make atomic ref updates the default behavior
149
- + replay: use die_for_incompatible_opt2() for option validation
150
- (this branch is used by ps/history.)
145
152
- Originally merged to 'next' on 2025-11-18
146
+* rs/xmkstemp-simplify (2025-11-17) 1 commit
147
+ (merged to 'next' on 2025-11-19 at 228e9f54ab)
148
+ + wrapper: simplify xmkstemp()
149
154
- "git replay" (experimental) learned to perform ref updates itself
155
- in a transaction by default, instead of emitting where each refs
156
- should point at and leaving the actual update to another command.
157
- cf. <00a5a8f3-f761-46e8-84cc-4bd95db68b49@gmail.com>
158
- source: <20251105191650.89975-1-siddharthasthana31@gmail.com>
150
+ Code simplification.
151
+ source: <058c5722-30f5-4bc5-90f5-24e4c6f3ff8f@web.de>
152
153
--------------------------------------------------
154
[New Topics]
155
156
+* pw/replay-exclude-gpgsig-fix (2025-11-26) 1 commit
157
+ - replay: do not copy "gpgsign-sha256" header
158
+
159
+ "git replay" forgot to omit the "gpgsig-sha256" extended header
160
+ from the resulting commit the same way it omits "gpgsig", which has
161
+ been corrected.
162
+
163
+ Will merge to 'next'.
164
+ source: <4f04af5790353b074cf122c450c1cd3f8d1cecf3.1764167611.git.phillip.wood@dunelm.org.uk>
165
+
166
+
167
+* tc/last-modified-options-cleanup (2025-11-26) 4 commits
168
+ - fixup! last-modified: document option --max-depth
169
+ - last-modified: document how depth is handled better
170
+ - last-modified: document option --max-depth
171
+ - last-modified: handle and document NUL termination
172
+
173
+ The "-z" and "--max-depth" documentation (and implementation of
174
+ "-z") in the "git last-modified" command have been updated.
175
+
176
+ Expecting a reroll.
177
+ source: <20251126-toon-last-modified-zzzz-v1-0-608350df0caa@iotcl.com>
178
+
179
+
180
+* yc/xdiff-patience-optim (2025-11-26) 1 commit
181
+ - xdiff: optimize patience diff's LCS search
182
+
183
+ The way patience diff finds LCS has been optimized.
184
+
185
+ Will merge to 'next'.
186
+ source: <pull.2109.git.git.1764152756908.gitgitgadget@gmail.com>
187
+
188
+
189
+* bc/zsh-testsuite (2025-11-27) 2 commits
190
+ - t5564: fix test hang under zsh's sh mode
191
+ - t0614: use numerical comparison with test_line_count
192
+
193
+ A few tests have been updated to work under the shell compatible
194
+ mode of zsh.
195
+
196
+ Will merge to 'next'.
197
+ source: <20251128012107.101431-1-sandals@crustytoothpaste.net>
198
+
199
+
200
+* ds/doc-scalar-config (2025-11-26) 5 commits
201
+ - scalar: document config settings
202
+ - scalar: alphabetize and simplify config
203
+ - scalar: remove stale config values
204
+ - scalar: use index.skipHash=true for performance
205
+ - scalar: annotate config file with "set by scalar"
206
+
207
+ Documentation updates.
208
+
209
+ Comments?
210
+ source: <pull.2010.git.1764195516.gitgitgadget@gmail.com>
211
+
212
+
213
+* pw/replay-drop-empty (2025-11-27) 2 commits
214
+ - replay: drop commits that become empty
215
+ - Merge branch 'ps/history' into pw/replay-drop-empty
216
+ (this branch uses ps/history.)
217
+
218
+ "git replay" is taught to drop commits that become empty (not the
219
+ ones that are empty in the original).
220
+
221
+ On hold, until the base topic stabilizes.
222
+ source: <8a2a1215306452147cc7b803530ab2429bf57f15.1764260150.git.phillip.wood@dunelm.org.uk>
223
+
224
+--------------------------------------------------
225
+[Cooking]
226
+
227
* sp/shallow-time-boundary (2025-11-23) 1 commit
228
- shallow: set borders which are all reachable after clone shallow since
229
@@ -172,40 +236,39 @@ Release tarballs are available at:
236
237
238
* rs/config-set-multi-error-message-fix (2025-11-24) 1 commit
175
- - config: fix suggestion for failed set of multi-valued option
239
+ (merged to 'next' on 2025-11-26 at 639a1e26d2)
240
+ + config: fix suggestion for failed set of multi-valued option
241
242
The error message given by "git config set", when the variable
243
being updated has more than one values defined, used old style "git
244
config" syntax with an incorrect option in its hint, both of which
245
have been corrected.
246
182
- Will merge to 'next'.
247
+ Will merge to 'master'.
248
source: <c09945fe-fee2-47f6-8193-ac60d7245209@web.de>
249
250
251
* rs/config-unset-opthelp-fix (2025-11-24) 1 commit
187
- - config: fix short help of unset flags
252
+ (merged to 'next' on 2025-11-26 at 31e282f4ae)
253
+ + config: fix short help of unset flags
254
255
The option help text given by "git config unset -h" described
256
the "--all" option to "replace", not "unset", multiple variables,
257
which has been corrected.
258
193
- Will merge to 'next'.
259
+ Will merge to 'master'.
260
source: <06997dce-e4d5-4889-8e70-5f44da3dc800@web.de>
261
262
197
-* wm/complete-git-short-opts (2025-11-24) 1 commit
198
- - Add completion for short options
263
+* wm/complete-git-short-opts (2025-11-26) 1 commit
264
+ - completion: complete "git -<TAB>" with short options
265
266
The command line completion script (in contrib/) learned to
267
complete "git -<TAB>" to give single-letter options like "-C".
268
203
- Expecting a reroll.
204
- cf. <xmqq5xayt66k.fsf@gitster.g>
205
- source: <pull.2100.git.git.1764052739534.gitgitgadget@gmail.com>
269
+ Will merge to 'next'?
270
+ source: <pull.2100.v2.git.git.1764174391776.gitgitgadget@gmail.com>
271
207
---------------------------------------------------
208
-[Cooking]
272
273
* ja/doc-synopsis-style (2025-11-24) 4 commits
274
(merged to 'next' on 2025-11-24 at 10610d9a57)
@@ -255,96 +318,31 @@ Release tarballs are available at:
318
source: <pull.2103.v3.git.git.1763675016637.gitgitgadget@gmail.com>
319
320
258
-* gf/win32-pthread-cond-wait-err (2025-11-18) 1 commit
259
- (merged to 'next' on 2025-11-21 at 89d9e04f91)
260
- + win32: return error if SleepConditionVariableCS fails
261
-
262
- Emulation code clean-up.
263
-
264
- Will merge to 'master'.
265
- source: <pull.2104.v2.git.git.1763480514065.gitgitgadget@gmail.com>
266
-
267
-
268
-* kn/ref-location (2025-11-19) 2 commits
321
+* kn/ref-location (2025-11-26) 2 commits
322
- refs: add GIT_REF_URI to specify reference backend and directory
323
- refs: support obtaining ref_store for given dir
324
325
A mechanism to specify what reference backend to use and store
326
references in which directory is introduced, which would likely to
327
be useful during ref migration.
275
- source: <20251119-kn-alternate-ref-dir-v1-0-4cf4a94c8bed@gmail.com>
328
277
-
278
-* jk/ci-windows-meson-test-fix (2025-11-18) 2 commits
279
- (merged to 'next' on 2025-11-20 at a0afd4fd5b)
280
- + ci(windows-meson-test): handle options and output like other test jobs
281
- + unit-test: ignore --no-chain-lint
282
-
283
- "Windows+meson" job at the GitHub Actions CI was hard to debug, as
284
- it did not show and save failed test artifacts, which has been
285
- corrected.
286
-
287
- Will merge to 'master'.
288
- source: <20251118093221.GA530337@coredump.intra.peff.net>
289
-
290
-
291
-* jk/test-mktemp-leakfix (2025-11-18) 1 commit
292
- (merged to 'next' on 2025-11-19 at 1da34f8b26)
293
- + test-mktemp: plug memory and descriptor leaks
294
-
295
- Test leakfix.
296
-
297
- Will merge to 'master'.
298
- source: <20251118122124.GA1117960@coredump.intra.peff.net>
299
-
300
-
301
-* js/ci-github-setup-go-update (2025-11-17) 1 commit
302
- (merged to 'next' on 2025-11-19 at 9922384c2b)
303
- + ci: bump actions/setup-go from 5 to 6
304
-
305
- Update a version of action used at the GitHub Actrions CI.
306
-
307
- Will merge to 'master'.
308
- source: <ebc68ec5b2abbc4702b94f833b9b3bf1adb79f1a.1763450087.git.zhiyou.jx@alibaba-inc.com>
329
+ Comments?
330
+ source: <20251126-kn-alternate-ref-dir-v2-0-8b9f6f18f635@gmail.com>
331
332
311
-* js/ci-show-breakage-in-dockerized-jobs (2025-11-25) 2 commits
312
- - amend! ci(dockerized): do show the result of failing tests again
313
- - ci(dockerized): do show the result of failing tests again
333
+* js/ci-show-breakage-in-dockerized-jobs (2025-11-17) 1 commit
334
+ (merged to 'next' on 2025-11-26 at 3c4a8c430f)
335
+ + ci(dockerized): do show the result of failing tests again
336
337
Dockerised jobs at the GitHub Actions CI have been taught to show
338
more details of failed tests.
339
318
- Will merge to 'next' after amending?
340
+ Will merge to 'master'.
341
cf. <xmqqpl9gike6.fsf@gitster.g>
342
cf. <CABPp-BErdhTjbqDem4Xvc-XbhgLUEpy9-eiaaR1F_diMca--6A@mail.gmail.com>
343
source: <pull.2003.git.1763399064983.gitgitgadget@gmail.com>
344
345
324
-* js/cmake-libgit-fix (2025-11-17) 1 commit
325
- (merged to 'next' on 2025-11-19 at 1593640ab0)
326
- + cmake: stop trying to build the reftable and xdiff libraries
327
-
328
- Makefile based build have recently been updated to build a
329
- libgit.a that also has reftable and xdiff objects; CMake based
330
- build procedure has been updated to match.
331
-
332
- Will merge to 'master'.
333
- source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com>
334
-
335
-
336
-* js/mingw-assign-comma-fix (2025-11-17) 1 commit
337
- (merged to 'next' on 2025-11-19 at d1a5807e11)
338
- + mingw: avoid the comma operator
339
-
340
- The "return errno = EFOO, -1" construct, which is heavily used in
341
- compat/mingw.c and triggers warnings under "-Wcomma", has been
342
- rewritten to avoid the warnings.
343
-
344
- Will merge to 'master'.
345
- source: <pull.2007.git.1763412374866.gitgitgadget@gmail.com>
346
-
347
-
346
* js/strip-scalar-too (2025-11-17) 1 commit
347
(merged to 'next' on 2025-11-25 at 9f2607acfb)
348
+ make strip: include `scalar`
@@ -356,39 +354,6 @@ Release tarballs are available at:
354
source: <pull.2004.git.1763409086322.gitgitgadget@gmail.com>
355
356
359
-* js/wincred-get-credential-alloc-fix (2025-11-17) 1 commit
360
- (merged to 'next' on 2025-11-19 at 4c43c53c49)
361
- + wincred: avoid memory corruption
362
-
363
- Under-allocation fix.
364
-
365
- Will merge to 'master'.
366
- source: <pull.2005.git.1763411984773.gitgitgadget@gmail.com>
367
-
368
-
369
-* pw/worktree-list-display-width-fix (2025-11-18) 2 commits
370
- (merged to 'next' on 2025-11-20 at 3a341524cb)
371
- + worktree list: quote paths
372
- + worktree list: fix column spacing
373
-
374
- "git worktree list" attempts to show paths to worktrees while
375
- aligning them, but miscounted display columns for the paths when
376
- non-ASCII characters were involved, which has been corrected.
377
-
378
- Will merge to 'master'.
379
- source: <cover.1763482051.git.phillip.wood@dunelm.org.uk>
380
-
381
-
382
-* rs/xmkstemp-simplify (2025-11-17) 1 commit
383
- (merged to 'next' on 2025-11-19 at 228e9f54ab)
384
- + wrapper: simplify xmkstemp()
385
-
386
- Code simplification.
387
-
388
- Will merge to 'master'.
389
- source: <058c5722-30f5-4bc5-90f5-24e4c6f3ff8f@web.de>
390
-
391
-
357
* dw/config-global-list (2025-10-09) 4 commits
358
- config: keep bailing on unreadable global files
359
- config: read global scope via config_sequence
@@ -435,24 +400,25 @@ Release tarballs are available at:
400
401
402
* ps/object-source-management (2025-11-18) 14 commits
438
- - odb: handle recreation of quarantine directories
439
- - odb: handle changing a repository's commondir
440
- - chdir-notify: add function to unregister listeners
441
- - odb: handle initialization of sources in `odb_new()`
442
- - http-push: stop setting up `the_repository` for each reference
443
- - t/helper: stop setting up `the_repository` repeatedly
444
- - builtin/index-pack: fix deferred fsck outside repos
445
- - oidset: introduce `oidset_equal()`
446
- - odb: move logic to disable ref updates into repo
447
- - odb: refactor `odb_clear()` to `odb_free()`
448
- - odb: adopt logic to close object databases
449
- - setup: convert `set_git_dir()` to have file scope
450
- - path: move `enter_repo()` into "setup.c"
451
- - Merge branch 'ps/object-source-loose' into ps/object-source-management
403
+ (merged to 'next' on 2025-11-26 at 6f98745b4a)
404
+ + odb: handle recreation of quarantine directories
405
+ + odb: handle changing a repository's commondir
406
+ + chdir-notify: add function to unregister listeners
407
+ + odb: handle initialization of sources in `odb_new()`
408
+ + http-push: stop setting up `the_repository` for each reference
409
+ + t/helper: stop setting up `the_repository` repeatedly
410
+ + builtin/index-pack: fix deferred fsck outside repos
411
+ + oidset: introduce `oidset_equal()`
412
+ + odb: move logic to disable ref updates into repo
413
+ + odb: refactor `odb_clear()` to `odb_free()`
414
+ + odb: adopt logic to close object databases
415
+ + setup: convert `set_git_dir()` to have file scope
416
+ + path: move `enter_repo()` into "setup.c"
417
+ + Merge branch 'ps/object-source-loose' into ps/object-source-management
418
419
Code refactoring around object database sources.
420
455
- Will merge to 'next' after amending a typo?
421
+ Will merge to 'master'.
422
cf. <aSAZSyUzIMvn-IvR@pks.im>
423
source: <20251119-b4-pks-odb-creation-v1-0-2b2ed2612cb6@pks.im>
424
@@ -514,19 +480,6 @@ Release tarballs are available at:
480
source: <20251105142944.73061-1-me@linux.beauty>
481
482
517
-* en/ort-rename-another-fix (2025-11-03) 3 commits
518
- (merged to 'next' on 2025-11-19 at 53d94af6b4)
519
- + merge-ort: fix failing merges in special corner case
520
- + merge-ort: remove debugging crud
521
- + t6429: update comment to mention correct tool
522
-
523
- Yet another corner case fix around renames in the "ort" merge
524
- strategy.
525
-
526
- Will merge to 'master'.
527
- source: <pull.1992.git.1762192908.gitgitgadget@gmail.com>
528
-
529
-
483
* jc/exclude-with-gitignore (2025-11-04) 1 commit
484
- dir.c: do not be fooled by :(exclude) pathspec elements
485
@@ -539,14 +492,15 @@ Release tarballs are available at:
492
493
494
* cc/fast-import-strip-if-invalid (2025-11-16) 3 commits
542
- - fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
543
- - commit: refactor verify_commit_buffer()
544
- - fast-import: refactor finalize_commit_buffer()
495
+ (merged to 'next' on 2025-11-26 at 7235cd0d18)
496
+ + fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>
497
+ + commit: refactor verify_commit_buffer()
498
+ + fast-import: refactor finalize_commit_buffer()
499
500
"git fast-import" learns "--strip-if-invalid" option to drop
501
invalid cryptographic signature from objects.
502
549
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
source: <20251117043450.322644-1-christian.couder@gmail.com>
505
506
@@ -594,18 +548,6 @@ Release tarballs are available at:
548
source: <20251117221621.2863243-1-sandals@crustytoothpaste.net>
549
550
597
-* ad/blame-diff-algorithm (2025-11-17) 2 commits
598
- (merged to 'next' on 2025-11-19 at e1e456469f)
599
- + blame: make diff algorithm configurable
600
- + xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASK
601
-
602
- "git blame" learns "--diff-algorithm=<algo>" option.
603
-
604
- Will merge to 'master'.
605
- cf. <fd03f2a5-bf9e-453f-97d1-d5a66bc87470@gmail.com>
606
- source: <pull.2075.v6.git.git.1763366672.gitgitgadget@gmail.com>
607
-
608
-
551
* lo/repo-info-all (2025-11-18) 2 commits
552
(merged to 'next' on 2025-11-21 at bb6bddcfc7)
553
+ repo: add --all to git-repo-info
@@ -691,6 +633,7 @@ Release tarballs are available at:
633
- replay: extract logic to pick commits
634
- wt-status: provide function to expose status for trees
635
- Merge branch 'sa/replay-atomic-ref-updates' into ps/history
636
+ (this branch is used by pw/replay-drop-empty.)
637
638
"git history" history rewriting UI.
639