What's cooking (2026/02 #04)

Junio C Hamano committed Feb 10, 2026 at 14:21 UTC e3de8cba334c6dc76e8cce246c7ca18c7aeb136c
1 file changed +285 -191
whats-cooking.txt
+285 -191
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Feb 2026, #03)
3 -X-master-at: 3e0db84c88c57e70ac8be8c196dfa92c5d656fbc
4 -X-next-at: 64333814d3ac6e46b6b9c308a6398a66743a4022
2 +Subject: What's cooking in git.git (Feb 2026, #04)
3 +X-master-at: 864f55e1906897b630333675a52874c0fec2a45c
4 +X-next-at: 88a6c151d7aca3a430499d8139678cc6d9ea6a98
5 Bcc: lwn@lwn.net, gitster@pobox.com
6
7 -What's cooking in git.git (Feb 2026, #03)
7 +What's cooking in git.git (Feb 2026, #04)
8 -----------------------------------------
9
10 Here are the topics that have been cooking in my tree. Commits
@@ -50,122 +50,297 @@ Release tarballs are available at:
50 --------------------------------------------------
51 [Graduated to 'master']
52
53 -* aa/add-p-previous-decisions (2026-01-08) 1 commit
54 - (merged to 'next' on 2026-01-21 at 4e2fe2bd9b)
55 - + add -p: show user's hunk decision when selecting hunks
53 +* ac/string-list-sort-u-and-tests (2026-01-29) 2 commits
54 + (merged to 'next' on 2026-01-30 at 742890e56f)
55 + + string-list: add string_list_sort_u() that mimics "sort -u"
56 + + u-string-list: add unit tests for string-list methods
57
57 - "git add -p" and friends note what the current status of the hunk
58 - being shown is.
59 - source: <aV_IGCld5T_dBxTs@Adekunles-MacBook-Air.local>
58 + The string_list API gains a new helper, string_list_sort_u(), and
59 + new unit tests to extend coverage.
60 + source: <20260125201500.63904-2-amishhhaaaa@gmail.com>
61
62
62 -* ac/sparse-checkout-string-list-cleanup (2026-01-21) 1 commit
63 - (merged to 'next' on 2026-01-23 at 885244a10d)
64 - + sparse-checkout: optimize string_list construction and add tests to verify deduplication.
63 +* kn/ref-batch-output-error-reporting-fix (2026-01-25) 6 commits
64 + (merged to 'next' on 2026-01-30 at fe8044c396)
65 + + fetch: delay user information post committing of transaction
66 + + receive-pack: utilize rejected ref error details
67 + + fetch: utilize rejected ref error details
68 + + update-ref: utilize rejected error details if available
69 + + refs: add rejection detail to the callback function
70 + + refs: skip to next ref when current ref is rejected
71
66 - Code clean-up.
67 - source: <20260121130005.72375-1-amishhhaaaa@gmail.com>
72 + A handful of code paths that started using batched ref update API
73 + (after Git 2.51 or so) lost detailed error output, which have been
74 + corrected.
75 + source: <20260125-633-regression-lost-diagnostic-message-when-pushing-non-commit-objects-to-refs-heads-v5-0-d58f3a9edf98@gmail.com>
76 +
77 +
78 +* ps/history (2026-01-13) 9 commits
79 + (merged to 'next' on 2026-01-29 at ecac247f83)
80 + + builtin/history: implement "reword" subcommand
81 + + builtin: add new "history" command
82 + + wt-status: provide function to expose status for trees
83 + + replay: support updating detached HEAD
84 + + replay: support empty commit ranges
85 + + replay: small set of cleanups
86 + + builtin/replay: move core logic into "libgit.a"
87 + + builtin/replay: extract core logic to replay revisions
88 + + Merge branch 'kh/replay-invalid-onto-advance' into ps/history
89 + (this branch is used by pw/replay-drop-empty.)
90 +
91 + "git history" history rewriting UI.
92 + source: <20260113-b4-pks-history-builtin-v11-0-e74ebfa2652d@pks.im>
93 +
94 +
95 +* pw/replay-drop-empty (2025-12-18) 2 commits
96 + (merged to 'next' on 2026-01-29 at 66b2238f5c)
97 + + replay: drop commits that become empty
98 + + Merge branch 'ps/history' into pw/replay-drop-empty
99 + (this branch uses ps/history.)
100 +
101 + "git replay" is taught to drop commits that become empty (not the
102 + ones that are empty in the original).
103 + source: <375adc4e941f3bb22a2b12ee26a083951ed724dd.1766076625.git.phillip.wood@dunelm.org.uk>
104 +
105 +
106 +* sb/doc-worktree-prune-expire-improvement (2026-01-27) 1 commit
107 + (merged to 'next' on 2026-01-30 at faf2e087b8)
108 + + worktree: clarify that --expire only affects missing worktrees
109 +
110 + The help text and the documentation for the "--expire" option of
111 + "git worktree [list|prune]" have been improved.
112 + source: <pull.2135.v3.git.git.1769578785381.gitgitgadget@gmail.com>
113 +
114 +
115 +* ty/perf-3400-optim (2026-01-30) 1 commit
116 + (merged to 'next' on 2026-02-01 at 6c019af192)
117 + + t/perf/p3400: speed up setup using fast-import
118 +
119 + Improve set-up time of a perf test.
120 + source: <20260130170123.642344-1-a3205153416@gmail.com>
121 +
122 +--------------------------------------------------
123 +[New Topics]
124 +
125 +* dk/complete-stash-import-export (2026-02-07) 1 commit
126 + - completion: add stash import, export
127
128 + Command line completion (in contrib/) update.
129
70 -* ap/http-probe-rpc-use-auth (2026-01-14) 1 commit
71 - (merged to 'next' on 2026-01-23 at 0439366395)
72 - + remote-curl: use auth for probe_rpc() requests too
130 + Comments?
131 + source: <20260207215924.28863-1-ben.knoble+github@gmail.com>
132
74 - HTTP transport failed to authenticate in some code paths, which has
75 - been corrected.
76 - source: <20260114163619.614297-2-aplattner@nvidia.com>
133
134 +* kh/doc-am-format-sendmail (2026-02-09) 1 commit
135 + - doc: add caveat about roundtripping format-patch
136
79 -* ar/submodule-gitdir-tweak (2026-01-12) 11 commits
80 - (merged to 'next' on 2026-01-23 at ef3c2cab02)
81 - + submodule: detect conflicts with existing gitdir configs
82 - + submodule: hash the submodule name for the gitdir path
83 - + submodule: fix case-folding gitdir filesystem collisions
84 - + submodule--helper: fix filesystem collisions by encoding gitdir paths
85 - + builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
86 - + submodule--helper: add gitdir migration command
87 - + submodule: allow runtime enabling extensions.submodulePathConfig
88 - + submodule: introduce extensions.submodulePathConfig
89 - + builtin/submodule--helper: add gitdir command
90 - + submodule: always validate gitdirs inside submodule_name_to_gitdir
91 - + submodule--helper: use submodule_name_to_gitdir in add_submodule
137 + Doc update.
138
93 - Avoid local submodule repository directory paths overlapping with
94 - each other by encoding submodule names before using them as path
95 - components.
96 - cf. <aWXh9hQYxFhWYC6a@pks.im>
97 - source: <20260112184632.1334495-1-adrian.ratiu@collabora.com>
139 + Comments?
140 + source: <V2_format-patch_caveats.34b@msgid.xyz>
141
142
100 -* dd/t5403-modernise (2026-01-12) 2 commits
101 - (merged to 'next' on 2026-01-23 at ca3ceb637e)
102 - + t5403: use test_cmp for post-checkout argument checks
103 - + t5403: introduce check_post_checkout helper function
143 +* kh/doc-patch-id-4 (2026-02-07) 3 commits
144 + - doc: patch-id: see also git-cherry(1)
145 + - doc: patch-id: add script example
146 + - doc: patch-id: emphasize multi-patch processing
147
105 - Test clean-up.
148 + Doc update.
149
150 + Comments?
151 + source: <CV_doc_patch-id_4.275@msgid.xyz>
152
108 -* jk/remote-tracking-ref-leakfix (2026-01-18) 4 commits
109 - (merged to 'next' on 2026-01-21 at 7f0736a973)
110 - + remote: always allocate branch.push_tracking_ref
111 - + remote: fix leak in branch_get_push_1() with invalid "simple" config
112 - + remote: drop const return of tracking_for_push_dest()
113 - + remote: return non-const pointer from error_buf()
114 - (this branch is used by hn/status-compare-with-push.)
153
116 - Leakfix.
117 - source: <20260119051858.GA1991308@coredump.intra.peff.net>
154 +* pw/commit-msg-sample-hook (2026-02-07) 3 commits
155 + - templates: detect messages that contain a separator line
156 + - templates: detect commit messages containing diffs
157 + - templates: add .gitattributes entry for sample hooks
158
159 + Update sample commit-msg hook to complain when a log message has
160 + material mailinfo considers the end of log message in the middle.
161
120 -* lp/diff-stat-utf8-display-width-fix (2026-01-15) 2 commits
121 - (merged to 'next' on 2026-01-23 at 80e7ddce3e)
122 - + t4073: add test for diffstat paths length when containing UTF-8 chars
123 - + diff: improve scaling of filenames in diffstat to handle UTF-8 chars
162 + Will merge to 'next'?
163 + source: <cover.1770476279.git.phillip.wood@dunelm.org.uk>
164
125 - The computation of column width made by "git diff --stat" was
126 - confused when pathnames contain non-ASCII characters.
127 - source: <cover.1768520441.git.lorenzo.pegorari2002@gmail.com>
165
166 +* bk/t2003-modernise (2026-02-09) 1 commit
167 + (merged to 'next' on 2026-02-10 at 561a73205e)
168 + + t2003: modernize path existence checks using test helpers
169
130 -* sp/myfirstcontribution-include-update (2026-01-12) 1 commit
131 - (merged to 'next' on 2026-01-23 at 2d039d03ff)
132 - + doc: MyFirstContribution: fix missing dependencies and clarify build steps
170 + Test update.
171 +
172 + Will merge to 'master'.
173 + source: <20260209112444.1268765-1-bkkaracay@gmail.com>
174 +
175 +
176 +* kh/doc-am-xref (2026-02-09) 4 commits
177 + - doc: am: fill out hook discussion
178 + - doc: am: add missing config am.messageId
179 + - doc: am: say that --message-id adds a trailer
180 + - doc: am: normalize git(1) command links
181
182 Doc update.
135 - source: <20260112195625.391821-1-shreyanshpaliwalcmsmn@gmail.com>
183
184 + Comments?
185 + source: <doc_am_gitlinks_and_am.messageId.321@msgid.xyz>
186 +
187 +
188 +* kh/doc-rerere-options-xref (2026-02-10) 1 commit
189 + (merged to 'next' on 2026-02-10 at 1ade94535a)
190 + + doc: rerere-options.adoc: link to git-rerere(1)
191
138 -* sp/t5500-cleanup (2026-01-21) 1 commit
139 - (merged to 'next' on 2026-01-23 at d5adc61ce8)
140 - + t5500: simplify test implementation and fix git exit code suppression
192 + Doc update.
193
142 - Test clean-up.
143 - source: <20260121130012.888299-1-shreyanshpaliwalcmsmn@gmail.com>
194 + Will merge to 'master'.
195 + source: <V2_doc_link_rerere.34f@msgid.xyz>
196
197
146 -* tc/last-modified-options-cleanup (2026-01-20) 4 commits
147 - (merged to 'next' on 2026-01-23 at e514d98b11)
148 - + last-modified: change default max-depth to 0
149 - + last-modified: document option '--max-depth'
150 - + last-modified: document option '-z'
151 - + last-modified: clarify in the docs the command takes a pathspec
198
153 - The "-z" and "--max-depth" documentation (and implementation of
154 - "-z") in the "git last-modified" command have been updated.
155 - source: <20260120-toon-last-modified-zzzz-v3-0-9bffd4968b0e@iotcl.com>
199 +* ps/ci-gitlab-msvc-updates (2026-02-09) 5 commits
200 + - gitlab-ci: handle failed tests on MSVC+Meson job
201 + - gitlab-ci: use "run-test-slice-meson.sh"
202 + - ci: make test slicing consistent across Meson/Make
203 + - ci: don't skip smallest test slice in GitLab
204 + - ci: handle failures of test-slice helper
205 +
206 + CI update.
207 +
208 + Breaks GitHub Actions CI.
209 + cf. <xmqqa4xgxn2m.fsf@gitster.g>
210 + source: <20260209-b4-pks-ci-meson-improvements-v1-0-38444dec4874@pks.im>
211 +
212 +
213 +* ps/tests-wo-iconv-fixes (2026-02-09) 4 commits
214 + - t6006: don't use iconv(1) without ICONV prereq
215 + - t5550: add ICONV prereq to tests that use "$HTTPD_URL/error"
216 + - t4205: improve handling of ICONV prerequisite
217 + - t4xxx: don't use iconv(1) without ICONV prereq
218 +
219 + Some tests assumed "iconv" is available without honoring ICONV
220 + prerequisite, which has been corrected.
221 +
222 + Comments?
223 + source: <20260209-b4-pks-ci-msvc-iconv-fixes-v1-0-1e3167cd8828@pks.im>
224 +
225 +
226 +* pw/meson-doc-mergetool (2026-02-09) 1 commit
227 + - meson: fix building mergetool docs
228 +
229 + Update build precedure for mergetool documentation in meson-based builds.
230 +
231 + WIll merge to 'next'.
232 + source: <604c79018992dee019205741934508091cdd1e47.1770631599.git.phillip.wood@dunelm.org.uk>
233 +
234 +
235 +* rs/clean-includes (2026-02-08) 1 commit
236 + (merged to 'next' on 2026-02-10 at 883d07f2eb)
237 + + remove duplicate includes
238 +
239 + Clean up redundant includes of header files.
240 +
241 + Will merge to 'master'.
242 + source: <280325e3-401c-47c7-98cf-c5cc7f719ee4@web.de>
243 +
244 +
245 +* rs/commit-commit-stack (2026-02-08) 1 commit
246 + (merged to 'next' on 2026-02-10 at c1a50b2859)
247 + + commit: use commit_stack
248 +
249 + Code clean-up to use the commit_stack API.
250 +
251 + Will merge to 'master'.
252 + source: <db40d132-14ca-4749-937a-9410ecc17dde@web.de>
253 +
254 +
255 +* rs/version-wo-the-repository (2026-02-08) 1 commit
256 + (merged to 'next' on 2026-02-10 at 80809d2b3d)
257 + + version: stop using the_repository
258 +
259 + Code clean-up.
260 +
261 + Will merge to 'master'.
262 + source: <afccdc3a-8672-49a7-b260-e77e617d8976@web.de>
263 +
264 +
265 +* rs/xdiff-wo-the-repository (2026-02-09) 1 commit
266 + (merged to 'next' on 2026-02-10 at dbb8a23008)
267 + + xdiff-interface: stop using the_repository
268 +
269 + Reduce dependency on the_repository of xdiff-interface layer.
270 +
271 + Will merge to 'master'.
272 + source: <59fe4ac7-605d-4eae-b13c-46996dd8814e@web.de>
273 +
274 +
275 +* sd/t7003-test-path-is-helpers (2026-02-09) 1 commit
276 + (merged to 'next' on 2026-02-10 at 5e3bc9f2b9)
277 + + t7003: modernize path existence checks using test helpers
278 +
279 + Test updates.
280 +
281 + Will merge to 'master'.
282 + source: <20260209172445.39536-1-valusoutrik@gmail.com>
283 +
284 +
285 +* ds/config-list-with-type (2026-02-09) 5 commits
286 + - config: make 'git config list --type=<X>' work
287 + - config: create special init for list mode
288 + - config: allow format_config() to filter
289 + - parse: add git_parse_maybe_pathname()
290 + - config: move show_all_config()
291 +
292 + "git config list" is taught to show the values interpreted for
293 + specific type with "--type=<X>" option.
294 +
295 + Comments?
296 + source: <pull.2044.git.1770698579.gitgitgadget@gmail.com>
297 +
298 +
299 +* jc/doc-rerere-update (2026-02-09) 1 commit
300 + (merged to 'next' on 2026-02-10 at 88a6c151d7)
301 + + rerere: minor documantation update
302 +
303 + Doc update.
304 +
305 + Will merge to 'master'.
306 + source: <xmqqikc54vse.fsf@gitster.g>
307 +
308 +
309 +* rr/gitweb-mobile (2026-02-09) 5 commits
310 + - gitweb: let page header grow on mobile for long wrapped project names
311 + - gitweb: fix mobile footer overflow by wrapping text and clearing floats
312 + - gitweb: fix mobile page overflow across log/commit/blob/diff views
313 + - gitweb: prevent project search bar from overflowing on mobile
314 + - gitweb: add viewport meta tag for mobile devices
315 +
316 + "gitweb" has been taught to be mobile friendly.
317 +
318 + Comments?
319 + source: <pull.2043.git.1770679038.gitgitgadget@gmail.com>
320 +
321 +
322 +* kn/osxkeychain-buildfix (2026-02-10) 1 commit
323 + - osxkeychain: define build targets in the top-level Makefile.
324 +
325 + Simplify build procedure for oxskeychain (in contrib/).
326 +
327 + Expecting a (hopefully small and final) reroll?
328 + cf. <xmqqpl6cxtr7.fsf@gitster.g>
329 + source: <pull.2046.git.1770746461307.gitgitgadget@gmail.com>
330
331 --------------------------------------------------
158 -[New Topics]
332 +[Cooking]
333
160 -* yt/merge-file-outside-a-repository (2026-02-05) 1 commit
161 - - merge-file: honor merge.conflictStyle outside of a repository
334 +* yt/merge-file-outside-a-repository (2026-02-07) 1 commit
335 + (merged to 'next' on 2026-02-10 at ee1ced4120)
336 + + merge-file: honor merge.conflictStyle outside of a repository
337
338 "git merge-file" can be run outside a repository, but it ignored
339 all configuration, even the per-user ones. The command now uses
340 available configuration files to find its customization.
341
167 - Will merge to 'next'?
168 - source: <D514F3BA-36DD-4DAD-BF73-609730390A27@ytausch.de>
342 + Will merge to 'master'.
343 + source: <3488DCC3-D127-465B-BB95-3D87BB2E48F6@ytausch.de>
344
345
346 * sb/merge-ours-sparse (2026-02-06) 2 commits
@@ -187,7 +362,7 @@ Release tarballs are available at:
362 "git add -p" learned a new mode that allows the user to revisit a
363 file that was already dealt with.
364
190 - Expecting a reroll.
365 + Expecting a gitk update.
366 source: <cover.1770390576.git.abrahamadekunle50@gmail.com>
367
368
@@ -200,8 +375,6 @@ Release tarballs are available at:
375 Will merge to 'master'.
376 source: <20260206062108.74072-1-valusoutrik@gmail.com>
377
203 ---------------------------------------------------
204 -[Cooking]
378
379 * am/doc-github-contributiong-link-to-submittingpatches (2026-01-31) 1 commit
380 (merged to 'next' on 2026-02-04 at 1f4534468b)
@@ -246,18 +419,18 @@ Release tarballs are available at:
419 source: <V2_shortlog_trailers.254@msgid.xyz>
420
421
249 -* kn/ref-location (2026-02-02) 4 commits
422 +* kn/ref-location (2026-02-09) 4 commits
423 - refs: add GIT_REFERENCE_BACKEND to specify reference backend
251 - - refs: parse and use the reference storage payload
252 - - refs: extract out `refs_create_refdir_stubs()`
424 - refs: allow reference location in refstorage config
425 + - refs: forward and use the reference storage payload
426 + - refs: extract out `refs_create_refdir_stubs()`
427
428 Allow the directory in which reference backends store their data to
429 be specified.
430
258 - Expecting a (hopefully small and final) reroll?
259 - cf. <aYX7z_nUc4xJC8Qs@pks.im>
260 - source: <20260202-kn-alternate-ref-dir-v4-0-3b30430411e3@gmail.com>
431 + Expecting a reroll or two?
432 + cf. <aYoMmhClPzdmLjII@pks.im>
433 + source: <20260209-kn-alternate-ref-dir-v5-0-740899834ceb@gmail.com>
434
435
436 * rs/blame-ignore-colors-fix (2026-02-01) 1 commit
@@ -395,7 +568,8 @@ Release tarballs are available at:
568 already do on Linux and Windows. Also adjust the way Windows
569 implementation reports this information to match the other two.
570
398 - Needs review.
571 + Expecting a (hopefully small and final) reroll?
572 + cf. <56c1a7eb-a645-4453-8024-b320c1ebd55e@gmail.com>
573 source: <pull.2040.git.1770307510.gitgitgadget@gmail.com>
574
575
@@ -420,7 +594,7 @@ Release tarballs are available at:
594 message to disambiguate using "git checkout", which has been
595 updated to use "git switch".
596
423 - Comments?
597 + Will merge to 'next'?
598 source: <20260129190616.645471-1-gitster@pobox.com>
599
600
@@ -450,42 +624,22 @@ Release tarballs are available at:
624 which has been corrected.
625
626 Will merge to 'next'?
627 + cf. <aYmleK3kGqzLXyJe@pks.im>
628 source: <20260206-b4-pks-fix-for-each-ref-in-misuse-v3-0-1e050c3d6a50@pks.im>
629
630
456 -* ty/perf-3400-optim (2026-01-30) 1 commit
457 - (merged to 'next' on 2026-02-01 at 6c019af192)
458 - + t/perf/p3400: speed up setup using fast-import
459 -
460 - Improve set-up time of a perf test.
461 -
462 - Will merge to 'master'.
463 - source: <20260130170123.642344-1-a3205153416@gmail.com>
464 -
465 -
631 * ja/doc-synopsis-style-even-more (2026-02-05) 4 commits
467 - - doc: convert git-show to synopsis style
468 - - doc: fix some style issues in git-clone and for-each-ref-options
469 - - doc: finalize git-clone documentation conversion to synopsis style
470 - - doc: convert git-submodule to synopsis style
632 + (merged to 'next' on 2026-02-09 at d732b9d6a0)
633 + + doc: convert git-show to synopsis style
634 + + doc: fix some style issues in git-clone and for-each-ref-options
635 + + doc: finalize git-clone documentation conversion to synopsis style
636 + + doc: convert git-submodule to synopsis style
637
638 A handful of documentation pages have been modernized to use the
639 "synopsis" style.
640
475 - Will merge to 'next'?
476 - source: <pull.2036.v4.git.1770351146.gitgitgadget@gmail.com>
477 -
478 -
479 -* ac/string-list-sort-u-and-tests (2026-01-29) 2 commits
480 - (merged to 'next' on 2026-01-30 at 742890e56f)
481 - + string-list: add string_list_sort_u() that mimics "sort -u"
482 - + u-string-list: add unit tests for string-list methods
483 -
484 - The string_list API gains a new helper, string_list_sort_u(), and
485 - new unit tests to extend coverage.
486 -
641 Will merge to 'master'.
488 - source: <20260125201500.63904-2-amishhhaaaa@gmail.com>
642 + source: <pull.2036.v4.git.1770351146.gitgitgadget@gmail.com>
643
644
645 * ps/object-info-bits-cleanup (2026-01-26) 3 commits
@@ -507,8 +661,7 @@ Release tarballs are available at:
661 Small clean-up of xdiff library to remove unnecessary data
662 duplication.
663
510 - Comments?
511 - This conflicts with en/xdiff-cleanup-3 that has been dormant for some time.
664 + Will merge to 'next'.
665 source: <cover.1769424529.git.phillip.wood@dunelm.org.uk>
666
667
@@ -623,23 +776,6 @@ Release tarballs are available at:
776 source: <pull.1987.v4.git.1770384180.gitgitgadget@gmail.com>
777
778
626 -* kn/ref-batch-output-error-reporting-fix (2026-01-25) 6 commits
627 - (merged to 'next' on 2026-01-30 at fe8044c396)
628 - + fetch: delay user information post committing of transaction
629 - + receive-pack: utilize rejected ref error details
630 - + fetch: utilize rejected ref error details
631 - + update-ref: utilize rejected error details if available
632 - + refs: add rejection detail to the callback function
633 - + refs: skip to next ref when current ref is rejected
634 -
635 - A handful of code paths that started using batched ref update API
636 - (after Git 2.51 or so) lost detailed error output, which have been
637 - corrected.
638 -
639 - Will merge to 'master'.
640 - source: <20260125-633-regression-lost-diagnostic-message-when-pushing-non-commit-objects-to-refs-heads-v5-0-d58f3a9edf98@gmail.com>
641 -
642 -
779 * ps/commit-list-functions-renamed (2026-01-15) 3 commits
780 (merged to 'next' on 2026-02-06 at f7ef001af4)
781 + commit: rename `free_commit_list()` to conform to coding guidelines
@@ -725,7 +861,7 @@ Release tarballs are available at:
861
862 Preparation of xdiff/ codebase to work with Rust
863
728 - What's the status of this one?
864 + Maybe rebase on top of a merge of 'master' with pw/xdiff-cleanups?
865 source: <pull.2156.git.git.1767379944.gitgitgadget@gmail.com>
866
867
@@ -801,24 +937,14 @@ Release tarballs are available at:
937 source: <pull.2144.git.git.1766850014289.gitgitgadget@gmail.com>
938
939
804 -* sb/doc-worktree-prune-expire-improvement (2026-01-27) 1 commit
805 - (merged to 'next' on 2026-01-30 at faf2e087b8)
806 - + worktree: clarify that --expire only affects missing worktrees
807 -
808 - The help text and the documentation for the "--expire" option of
809 - "git worktree [list|prune]" have been improved.
810 -
811 - Will merge to 'master'.
812 - source: <pull.2135.v3.git.git.1769578785381.gitgitgadget@gmail.com>
813 -
814 -
940 * pc/lockfile-pid (2026-01-22) 1 commit
816 - - lockfile: add PID file for debugging stale locks
941 + (merged to 'next' on 2026-02-09 at 87bfa08d16)
942 + + lockfile: add PID file for debugging stale locks
943
944 Allow recording process ID of the process that holds the lock next
945 to a lockfile for diagnosis.
946
821 - Will merge to 'next'.
947 + Will merge to 'master'.
948 source: <pull.2011.v6.git.1769109815197.gitgitgadget@gmail.com>
949
950
@@ -860,25 +986,13 @@ Release tarballs are available at:
986 source: <cover.1768420450.git.me@ttaylorr.com>
987
988
863 -* pw/replay-drop-empty (2025-12-18) 2 commits
864 - (merged to 'next' on 2026-01-29 at 66b2238f5c)
865 - + replay: drop commits that become empty
866 - + Merge branch 'ps/history' into pw/replay-drop-empty
867 - (this branch uses ps/history.)
868 -
869 - "git replay" is taught to drop commits that become empty (not the
870 - ones that are empty in the original).
871 -
872 - On hold. We need to figure out what to do with ps/history.
873 - source: <375adc4e941f3bb22a2b12ee26a083951ed724dd.1766076625.git.phillip.wood@dunelm.org.uk>
874 -
875 -
876 -* bc/sha1-256-interop-02 (2025-11-17) 15 commits
989 +* bc/sha1-256-interop-02 (2026-02-07) 16 commits
990 - object-file-convert: always make sure object ID algo is valid
991 - rust: add a small wrapper around the hashfile code
992 - rust: add a new binary object map format
993 - rust: add functionality to hash an object
994 - rust: add a build.rs script for tests
995 + - rust: fix linking binaries with cargo
996 - hash: expose hash context functions to Rust
997 - write-or-die: add an fsync component for the object map
998 - csum-file: define hashwrite's count as a uint32_t
@@ -893,26 +1007,6 @@ Release tarballs are available at:
1007 The code to maintain mapping between object names in multiple hash
1008 functions is being added, written in Rust.
1009
896 - Any progress on CI breakages???
897 - source: <20251117221621.2863243-1-sandals@crustytoothpaste.net>
898 -
899 -
900 -* ps/history (2026-01-13) 9 commits
901 - (merged to 'next' on 2026-01-29 at ecac247f83)
902 - + builtin/history: implement "reword" subcommand
903 - + builtin: add new "history" command
904 - + wt-status: provide function to expose status for trees
905 - + replay: support updating detached HEAD
906 - + replay: support empty commit ranges
907 - + replay: small set of cleanups
908 - + builtin/replay: move core logic into "libgit.a"
909 - + builtin/replay: extract core logic to replay revisions
910 - + Merge branch 'kh/replay-invalid-onto-advance' into ps/history
911 - (this branch is used by pw/replay-drop-empty.)
912 -
913 - "git history" history rewriting UI.
914 -
915 - What's next for this topic?CABPp-BHkNLdH4C7U4sFoVhrsSPH8KAaDtOdLEQGyajmXZz9hVg@mail.gmail.com
916 - cf. <aWpoMcgwsfRCCrr4@szeder.dev>
917 - cf. <CABPp-BHkNLdH4C7U4sFoVhrsSPH8KAaDtOdLEQGyajmXZz9hVg@mail.gmail.com>
918 - source: <20260113-b4-pks-history-builtin-v11-0-e74ebfa2652d@pks.im>
1010 + Comments? v1 saw a lot of discussions, v2 didn't, and this is v3,
1011 + which is essentially identical to v2 with CI fixes (which work!).
1012 + source: <20260207200446.2837699-1-sandals@crustytoothpaste.net>