What's cooking (2026/01 #02)

diff --git a/whats-cooking.txt b/whats-cooking.txt
index 144d9402b5e9a770e4d3bff8638e8ddca78efa55..45a0079886d69aaa8661fee4ddf59d2de33bb831 100644 (file)
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
 To: git@vger.kernel.org
-Subject: What's cooking in git.git (Jan 2026, #01)
+Subject: What's cooking in git.git (Jan 2026, #02)
 X-master-at: 68cb7f9e92a5d8e9824f5b52ac3d0a9d8f653dbe
-X-next-at: 883dcfc63e9919461b343a9f21c411752d32df39
+X-next-at: c9366fe5a04afd4bfc01bb74b2471bc26509b37a
 Bcc: lwn@lwn.net, gitster@pobox.com
 
-What's cooking in git.git (Jan 2026, #01)
+What's cooking in git.git (Jan 2026, #02)
 -----------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
@@ -48,6 +48,70 @@ Release tarballs are available at:
 --------------------------------------------------
 [New Topics]
 
+* en/xdiff-cleanup-3 (2026-01-03) 11 commits
+ - SQUASH??? cocci
+ - xdiff: move xdl_cleanup_records() from xprepare.c to xdiffi.c
+ - xdiff: remove dependence on xdlclassifier from xdl_cleanup_records()
+ - xdiff: replace xdfile_t.dend with xdfenv_t.delta_end
+ - xdiff: replace xdfile_t.dstart with xdfenv_t.delta_start
+ - xdiff: cleanup xdl_trim_ends()
+ - xdiff: use xdfenv_t in xdl_trim_ends() and xdl_cleanup_records()
+ - xdiff: let patience and histogram benefit from xdl_trim_ends()
+ - xdiff: don't waste time guessing the number of lines
+ - xdiff: make classic diff explicit by creating xdl_do_classic_diff()
+ - ivec: introduce the C side of ivec
+
+ Preparation of xdiff/ codebase to work with Rust
+
+ Comments?
+ source: <pull.2156.git.git.1767379944.gitgitgadget@gmail.com>
+
+
+* hn/status-compare-with-push (2026-01-04) 2 commits
+ - status: show comparison with push remote tracking branch
+ - refactor format_branch_comparison in preparation
+
+ "git status" learned to show comparison between the current branch
+ and its push destination as well as its upstream, when the two are
+ different (i.e., triangular workflow).
+
+ Comments?
+ source: <pull.2138.v16.git.git.1767568882.gitgitgadget@gmail.com>
+
+
+* ob/core-attributesfile-in-repository (2026-01-02) 1 commit
+ - environment: move "core.attributesFile" into repo-setting
+
+ The core.attributesfile is intended to be set per repository, but
+ were kept track of by a single global variable in-core, which has
+ been corrected by moving it to per-repository data structure.
+
+ Comments?
+ source: <aVfzMsN2ouY3UBFG@ubuntu>
+
+
+* aa/add-p-previous-decisions (2026-01-04) 1 commit
+ - add -p: show user's hunk decision when selecting hunks
+
+ "git add -p" and friends notes what the current status of the hunk
+ being shown is.
+
+ Comments?
+ source: <aVpI36nPuZAEchuM@Adekunles-MacBook-Air.local>
+
+
+* ps/t1300-2021-use-test-path-is-helpers (2026-01-04) 1 commit
+  (merged to 'next' on 2026-01-05 at c9366fe5a0)
+ + t1300: use test helpers instead of `test` command
+
+ Test updates.
+
+ Will merge to 'master'.
+ source: <20260104194812.15134-1-pushkarkumarsingh1970@gmail.com>
+
+--------------------------------------------------
+[Cooking]
+
 * pt/fsmonitor-linux (2025-12-31) 1 commit
  - fsmonitor: implement filesystem change listener for Linux
 
@@ -62,20 +126,18 @@ Release tarballs are available at:
 
  Test fixup.
 
- Will merge to 'next'?
+ Comments?
  source: <pull.2150.v2.git.git.1767226763360.gitgitgadget@gmail.com>
 
 
-* pt/t7800-difftool-test-racefix (2025-12-31) 1 commit
+* pt/t7800-difftool-test-racefix (2026-01-03) 1 commit
  - t7800: fix racy "difftool --dir-diff syncs worktree" test
 
  Test fixup.
 
  Will merge to 'next'.
- source: <pull.2149.git.git.1767219599334.gitgitgadget@gmail.com>
+ source: <pull.2149.v3.git.git.1767472809897.gitgitgadget@gmail.com>
 
---------------------------------------------------
-[Cooking]
 
 * dd/t5403-modernise (2025-12-29) 1 commit
   (merged to 'next' on 2026-01-01 at d1d712e288)
@@ -106,7 +168,8 @@ Release tarballs are available at:
  "git fsck" used inconsistent set of refs to show a confused
  warning, which has been corrected.
 
- Will merge to 'next'?
+ Waiting for review responses.
+ cf. <20260102054922.GA2580212@coredump.intra.peff.net>
  source: <pull.2026.git.1767035549378.gitgitgadget@gmail.com>
 
 
@@ -173,25 +236,26 @@ Release tarballs are available at:
 
 
 * rs/commit-stack (2025-12-24) 14 commits
- - commit-reach: use commit_stack
- - commit-graph: use commit_stack
- - commit: add commit_stack_grow()
- - shallow: use commit_stack
- - pack-bitmap-write: use commit_stack
- - commit: add commit_stack_init()
- - test-reach: use commit_stack
- - remote: use commit_stack for src_commits
- - remote: use commit_stack for sent_tips
- - remote: use commit_stack for local_commits
- - name-rev: use commit_stack
- - midx: use commit_stack
- - log: use commit_stack
- - revision: export commit_stack
+  (merged to 'next' on 2026-01-05 at 8b44eff694)
+ + commit-reach: use commit_stack
+ + commit-graph: use commit_stack
+ + commit: add commit_stack_grow()
+ + shallow: use commit_stack
+ + pack-bitmap-write: use commit_stack
+ + commit: add commit_stack_init()
+ + test-reach: use commit_stack
+ + remote: use commit_stack for src_commits
+ + remote: use commit_stack for sent_tips
+ + remote: use commit_stack for local_commits
+ + name-rev: use commit_stack
+ + midx: use commit_stack
+ + log: use commit_stack
+ + revision: export commit_stack
 
  Code clean-up, unifying various hand-rolled "list of commit
  objects" and use the commit_stack API.
 
- Will merge to 'next'?
+ Will merge to 'master'.
  source: <20251224170327.68049-1-l.s.r@web.de>
 
 
@@ -226,12 +290,13 @@ Release tarballs are available at:
 
 
 * sb/bundle-uri-without-uri (2025-12-19) 1 commit
- - bundle-uri: validate that bundle entries have a uri
+  (merged to 'next' on 2026-01-05 at 62d0a58199)
+ + bundle-uri: validate that bundle entries have a uri
 
  Diagnose invalid bundle-URI that lack the URI entry, instead of
  crashing.
 
- Will merge to 'next'?
+ Will merge to 'master'.
  source: <pull.2134.v2.git.git.1766160106521.gitgitgadget@gmail.com>
 
 
@@ -247,15 +312,16 @@ Release tarballs are available at:
 
 
 * ja/doc-synopsis-style-more (2025-12-20) 5 commits
- - doc: convert git-remote to synopsis style
- - doc: convert git stage to use synopsis block
- - doc: convert git-status tables to AsciiDoc format
- - doc: convert git-status to synopsis style
- - doc: fix t0450-txt-doc-vs-help to select only first synopsis block
+  (merged to 'next' on 2026-01-05 at 20eb741139)
+ + doc: convert git-remote to synopsis style
+ + doc: convert git stage to use synopsis block
+ + doc: convert git-status tables to AsciiDoc format
+ + doc: convert git-status to synopsis style
+ + doc: fix t0450-txt-doc-vs-help to select only first synopsis block
 
  More doc style updates.
 
- Will merge to 'next'?
+ Will merge to 'master'.
  source: <pull.2020.git.1766258187.gitgitgadget@gmail.com>
 
 
@@ -628,7 +694,7 @@ Release tarballs are available at:
  source: <20251226122334.16687-1-adrian.ratiu@collabora.com>
 
 
-* je/doc-reset (2025-12-18) 4 commits
+* je/doc-reset (2026-01-01) 4 commits
  - doc: git-reset: clarify `git reset <pathspec>`
  - doc: git-reset: clarify `git reset [mode]`
  - doc: git-reset: clarify intro
@@ -636,8 +702,10 @@ Release tarballs are available at:
 
  Documentation updates.
 
- Will merge to 'next'?
- source: <cover.1766103827.git.ben.knoble+github@gmail.com>
+ Expecting a (hopefully small and final) reroll.
+ cf. <5953760.DvuYhMxLoT@piment-oiseau>
+ cf. <1943073.tdWV9SEqCh@piment-oiseau>
+ source: <cover.1767307382.git.ben.knoble+github@gmail.com>
 
 
 * ps/history (2025-12-03) 13 commits