What's cooking (2026/04 #04)
diff --git a/whats-cooking.txt b/whats-cooking.txt index 509be53..333bfb1 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt
@@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Apr 2026, #03) -X-master-at: 2b39a27d40682c09ac1c031f099ee602061597cd -X-next-at: 66d5323bbc44eb35dc937110f5cd0e9539e24623 +Subject: What's cooking in git.git (Apr 2026, #04) +X-master-at: 9e8f4e9c04e3efa494e78b710e0c5f6cc77a0a5e +X-next-at: 96b250ada0479af53128b98c3cfefe452196b568 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Apr 2026, #03) +What's cooking in git.git (Apr 2026, #04) ----------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,8 +17,6 @@ of no activity (of course they can be resubmitted when new interests arise). -Git 2.54-rc1 has been tagged. Let's see how solid this is ;-) - Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. @@ -48,129 +46,163 @@ https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] +[New Topics] -* jc/whitespace-incomplete-line (2026-03-17) 1 commit - (merged to 'next' on 2026-04-01 at 10a4d95236) - + apply: fix new-style empty context line triggering incomplete-line check +* sp/refs-reduce-the-repository (2026-04-04) 3 commits + (merged to 'next' on 2026-04-09 at bb1d626802) + + refs/reftable-backend: drop uses of the_repository + + refs: remove the_hash_algo global state + + refs: add struct repository parameter in get_files_ref_lock_timeout_ms() - Fix whitespace correction for new-style empty context lines. - source: <xmqqldfql4hp.fsf@gitster.g> + Code clean-up to use the right instance of a repository instance in + calls inside refs subsystem. + + Will cook in 'next'. + source: <20260404135914.61195-1-shreyanshpaliwalcmsmn@gmail.com> -* jd/read-cache-trace-wo-the-repository (2026-03-30) 1 commit - (merged to 'next' on 2026-04-01 at 7047e45a6d) - + read-cache: use istate->repo for trace2 logging +* ps/odb-in-memory (2026-04-10) 18 commits + - t/unit-tests: add tests for the in-memory object source + - odb: generic in-memory source + - odb/source-inmemory: stub out remaining functions + - odb/source-inmemory: implement `freshen_object()` callback + - odb/source-inmemory: implement `count_objects()` callback + - odb/source-inmemory: implement `find_abbrev_len()` callback + - odb/source-inmemory: implement `for_each_object()` callback + - odb/source-inmemory: convert to use oidtree + - oidtree: add ability to store data + - cbtree: allow using arbitrary wrapper structures for nodes + - odb/source-inmemory: implement `write_object_stream()` callback + - odb/source-inmemory: implement `write_object()` callback + - odb/source-inmemory: implement `read_object_stream()` callback + - odb/source-inmemory: implement `read_object_info()` callback + - odb: fix unnecessary call to `find_cached_object()` + - odb/source-inmemory: implement `free()` callback + - odb: introduce "in-memory" source + - Merge branch 'jt/odb-transaction-write' into ps/odb-in-memory + (this branch uses jt/odb-transaction-write.) - A handful of inappropriate uses of the_repository have been - rewritten to use the right repository structure instance in the - read-cache.c codepath. - source: <pull.2253.v4.git.git.1774895886678.gitgitgadget@gmail.com> + Add a new odb "in-memory" source that is meant to only hold + tentative objects (like the virtual blob object that represents the + working tree file used by "git blame"). + + Comments? + source: <20260410-b4-pks-odb-source-inmemory-v3-0-22fd0fad58fe@pks.im> -* jt/fast-import-signed-modes (2026-03-26) 5 commits - (merged to 'next' on 2026-04-01 at bec92be5e9) - + fast-import: add 'abort-if-invalid' mode to '--signed-tags=<mode>' - + fast-import: add 'sign-if-invalid' mode to '--signed-tags=<mode>' - + fast-import: add 'strip-if-invalid' mode to '--signed-tags=<mode>' - + fast-import: add 'abort-if-invalid' mode to '--signed-commits=<mode>' - + fast-export: check for unsupported signing modes earlier +* jc/doc-timestamps-in-stat (2026-04-10) 1 commit + - CodingGuidelines: st_mtimespec vs st_mtim vs st_mtime - Handling of signed commits and tags in fast-import has been made more - configurable. - source: <20260326191414.3783974-1-jltobler@gmail.com> + Doc update. + source: <xmqqzf3aofdj.fsf_-_@gitster.g> -* mm/line-log-use-standard-diff-output (2026-03-16) 4 commits - (merged to 'next' on 2026-04-01 at 724e6526dc) - + doc: note that -L supports patch formatting and pickaxe options - + t4211: add tests for -L with standard diff options - + line-log: route -L output through the standard diff pipeline - + line-log: fix crash when combined with pickaxe options +* ps/test-set-e-clean (2026-04-13) 12 commits + . t: detect errors outside of test cases + . t9902: fix use of `read` with `set -e` + . t6002: fix use of `expr` with `set -e` + . t1301: don't fail in case setfacl(1) doesn't exist or fails + . t0008: silence error in subshell when using `grep -v` + . t: prepare `test_when_finished ()`/`test_atexit()` for `set -e` + . t: prepare execution of potentially failing commands for `set -e` + . t: prepare conditional test execution for `set -e` + . t: prepare `git config --unset` calls for `set -e` + . t: prepare `stop_git_daemon ()` for `set -e` + . t: prepare `test_must_fail ()` for `set -e` + . t: prepare `test_match_signal ()` calls for `set -e` - The way the "git log -L<range>:<file>" feature is bolted onto the - log/diff machinery is being reworked a bit to make the feature - compatible with more diff options, like -S/G. - cf. <xmqqbjg3y8i9.fsf@gitster.g> - source: <pull.2065.v2.git.1773714095.gitgitgadget@gmail.com> + The test suite harness and many individual test scripts have been + updated to work correctly when 'set -e' is in effect, which helps + detect misspelled test commands. - -* ps/commit-graph-overflow-fix (2026-03-23) 1 commit - (merged to 'next' on 2026-04-01 at c502054354) - + commit-graph: fix writing generations with dates exceeding 34 bits - - Fix a regression in writing the commit-graph where commits with dates - exceeding 34 bits (beyond year 2514) could cause an underflow and - crash Git during the generation data overflow chunk writing. - source: <20260324-pks-commit-graph-overflow-v2-1-843568cf8780@pks.im> - - -* ps/fsck-wo-the-repository (2026-03-23) 12 commits - (merged to 'next' on 2026-04-01 at 6ab7607f2d) - + builtin/fsck: stop using `the_repository` in error reporting - + builtin/fsck: stop using `the_repository` when marking objects - + builtin/fsck: stop using `the_repository` when checking packed objects - + builtin/fsck: stop using `the_repository` with loose objects - + builtin/fsck: stop using `the_repository` when checking reflogs - + builtin/fsck: stop using `the_repository` when checking refs - + builtin/fsck: stop using `the_repository` when snapshotting refs - + builtin/fsck: fix trivial dependence on `the_repository` - + fsck: drop USE_THE_REPOSITORY - + fsck: store repository in fsck options - + fsck: initialize fsck options via a function - + fetch-pack: move fsck options into function scope - - Internals of "git fsck" have been refactored to not depend on the - global `the_repository` variable. - source: <20260323-b4-pks-fsck-without-the-repository-v2-0-e8dc79bca651@pks.im> - - -* ps/receive-pack-updateinstead-in-worktree (2026-03-30) 3 commits - (merged to 'next' on 2026-04-01 at df61eac37b) - + receive-pack: use worktree HEAD for updateInstead - + t5516: clean up cloned and new-wt in denyCurrentBranch and worktrees test - + t5516: test updateInstead with worktree and unborn bare HEAD - - The check in "receive-pack" to prevent a checked out branch from - getting updated via updateInstead mechanism has been corrected. - source: <20260330111822.165188-1-pabloosabaterr@gmail.com> - - -* rs/history-short-help-fix (2026-04-06) 1 commit - (merged to 'next' on 2026-04-07 at d3d6ef5197) - + history: fix short help for argument of --update-refs - - Glitches in "git history -h" have been corrected. - source: <ff6a940c-39fc-4dbf-a164-7770c7f26a31@web.de> - - -* sp/add-patch-with-fewer-the-repository (2026-03-17) 1 commit - (merged to 'next' on 2026-04-01 at b9edaddcff) - + add-patch: use repository instance from add_i_state instead of the_repository - - Reduce dependency on `the_repository` in add-patch.c file. - source: <20260317155230.619378-1-shreyanshpaliwalcmsmn@gmail.com> - - -* th/backfill-auto-detect-sparseness-fix (2026-04-04) 1 commit - (merged to 'next' on 2026-04-07 at c47ef7d0f1) - + backfill: auto-detect sparse-checkout from config - - "git backfill" is capable of auto-detecting a sparsely checked out - working tree, which was broken. - source: <20260404111557.17220-1-viking4@gmail.com> - - -* yc/path-walk-fix-error-reporting (2026-03-20) 1 commit - (merged to 'next' on 2026-04-01 at ddcff8b9c6) - + path-walk: fix NULL pointer dereference in error message - - The value of a wrong pointer variable was referenced in an error - message that reported that it shouldn't be NULL. - source: <20260320114823.3151961-1-ysinghcin@gmail.com> + Comments? + source: <20260413-b4-pks-tests-with-set-e-v1-0-5b83763a0e84@pks.im> -------------------------------------------------- -[New Topics] +[Graduated to 'master'] + +* bc/ref-storage-default-doc-update (2026-04-02) 1 commit + (merged to 'next' on 2026-04-09 at 6b423ab8ba) + + docs: correct information about reftable + + Doc update. + source: <20260402224241.4104726-1-sandals@crustytoothpaste.net> + + +* ds/rev-list-maximal-only-optim (2026-04-06) 3 commits + (merged to 'next' on 2026-04-07 at 7a70817efa) + + rev-list: use reduce_heads() for --maximal-only + + p6011: add perf test for rev-list --maximal-only + + t6600: test --maximal-only and --independent + + "git rev-list --maximal-only" has been optimized by borrowing the + logic used by "git show-branch --independent", which computes the + same kind of information much more efficiently. + source: <pull.2082.git.1775482048.gitgitgadget@gmail.com> + + +* jc/ci-github-actions-use-checkout-v5 (2026-04-13) 1 commit + (merged to 'next' on 2026-04-13 at 9c883467ad) + + CI: bump actions/checkout from 4 to 5 for rust-analysis job + + CI dependency updates. + source: <xmqqfr4yhg5v.fsf@gitster.g> + + +* jc/no-writev-does-not-work (2026-04-09) 5 commits + (merged to 'next' on 2026-04-10 at 779546e6a3) + + writev: retract the topic until we have a better emulation + + Revert "compat/posix: introduce writev(3p) wrapper" + + Revert "wrapper: introduce writev(3p) wrappers" + + Revert "sideband: use writev(3p) to send pktlines" + + Revert "cmake: use writev(3p) wrapper as needed" + + We used writev() in limited code paths and supplied emulation for + platforms without working writev(), but the emulation was too + faithful to the spec to make the result useless to send even 64kB; + revert the topic and plan to restart the effort later. + source: <xmqqmrzbreav.fsf_-_@gitster.g> + + +* jd/cache-tree-trace-wo-the-repository (2026-03-31) 1 commit + (merged to 'next' on 2026-04-02 at e36937bb5e) + + cache-tree: use index state repository in trace2 calls + + Code cleanup. + source: <pull.2259.git.git.1774951373588.gitgitgadget@gmail.com> + + +* jk/c23-const-preserving-fixes-more (2026-04-03) 13 commits + (merged to 'next' on 2026-04-06 at 9eebe11338) + + git-compat-util: fix CONST_OUTPARAM typo and indentation + (merged to 'next' on 2026-04-02 at b060d988f4) + + refs/files-backend: drop const to fix strchr() warning + + http: drop const to fix strstr() warning + + range-diff: drop const to fix strstr() warnings + + pkt-line: make packet_reader.line non-const + + skip_prefix(): check const match between in and out params + + pseudo-merge: fix disk reads from find_pseudo_merge() + + find_last_dir_sep(): convert inline function to macro + + run-command: explicitly cast away constness when assigning to void + + pager: explicitly cast away strchr() constness + + transport-helper: drop const to fix strchr() warnings + + http: add const to fix strchr() warnings + + convert: add const to fix strchr() warnings + + Further work to adjust the codebase for C23 that changes functions + like strchr() that discarded constness when they return a pointer into + a const string to preserve constness. + source: <20260402041433.GA3501120@coredump.intra.peff.net> + source: <20260404054211.GA1346444@coredump.intra.peff.net> + + +* jk/doc-markup-sub-list-indentation (2026-04-11) 1 commit + (merged to 'next' on 2026-04-13 at 738824c9ca) + + gitglossary: fix indentation of sub-lists + + Doc mark-up update for entries in the glossary with bulleted lists. + source: <20260411215518.GA1651019@coredump.intra.peff.net> + * jt/index-fd-wo-repo-regression-fix-maint (2026-04-07) 1 commit + object-file: avoid ODB transaction when not writing objects @@ -179,18 +211,92 @@ During Git 2.52 timeframe, we broke streaming computation of object hash outside a repository, which has been corrected. - Will merge to 'master'. + +* kh/doc-am-xref (2026-04-11) 2 commits + (merged to 'next' on 2026-04-13 at 400039b45c) + + doc: am: correct to full --no-message-id + + doc: am: revert Message-ID trailer claim + + Doc update. + source: <msg-id_is_not_trailer.570@msgid.xyz> + source: <typo_--no-message-id.572@msgid.xyz> -* jt/index-fd-wo-repo-regression-fix (2026-04-07) 1 commit - (merged to 'next' on 2026-04-07 at 7339897c7c) - + Merge branch 'jt/index-fd-wo-repo-regression-fix-maint' into HEAD - (this branch uses jt/index-fd-wo-repo-regression-fix-maint.) +* kh/doc-config-list (2026-04-05) 2 commits + (merged to 'next' on 2026-04-07 at fb95f091cc) + + doc: gitcvs-migration: rephrase “man page” + + doc: replace git config --list/-l with `list` - During Git 2.52 timeframe, we broke streaming computation of object - hash outside a repository, which has been corrected. + "git config list" is the official way to spell "git config -l" and + "git config --list". Use it to update the documentation. + source: <V2_CV_doc_deprecation_config_--list.569@msgid.xyz> - Will merge to 'master'. + +* ng/add-files-to-cache-wo-rename (2026-04-01) 1 commit + (merged to 'next' on 2026-04-02 at 8723880fc0) + + read-cache: disable renames in add_files_to_cache + + add_files_to_cache() used diff_files() to detect only the paths that + are different between the index and the working tree and add them, + which does not need rename detection, which interfered with unnecessary + conflicts. + source: <20260401190033.11325-1-blindmansion@gmail.com> + + +* ps/archive-prefix-doc (2026-04-08) 1 commit + (merged to 'next' on 2026-04-09 at ed6aa0e448) + + archive: document --prefix handling of absolute and parent paths + + Doc update. + source: <20260408160005.193621-2-pushkarkumarsingh1970@gmail.com> + + +* ps/odb-cleanup (2026-03-31) 7 commits + (merged to 'next' on 2026-04-02 at 1dd8236dfb) + + odb: drop unneeded headers and forward decls + + odb: rename `odb_has_object()` flags + + odb: use enum for `odb_write_object` flags + + odb: rename `odb_write_object()` flags + + treewide: use enum for `odb_for_each_object()` flags + + CodingGuidelines: document our style for flags + + Merge branch 'ps/odb-generic-object-name-handling' into ps/odb-cleanup + (this branch is used by ps/odb-in-memory) + + Various code clean-up around odb subsystem. + source: <20260401-pks-odb-cleanups-v1-0-89adba9ada68@pks.im> + + +* ps/reftable-portability (2026-04-02) 5 commits + (merged to 'next' on 2026-04-02 at 04adce37b9) + + reftable/system: add abstraction to mmap files + + reftable/system: add abstraction to retrieve time in milliseconds + + reftable/fsck: use REFTABLE_UNUSED instead of UNUSED + + reftable/stack: provide fsync(3p) via system header + + reftable: introduce "reftable-system.h" header + + Update reftable library part with what is used in libgit2 to improve + portability to different target codebases and platforms. + source: <20260402-pks-reftable-portability-fixes-v2-0-bc110cee0ae0@pks.im> + + +* ss/t7004-unhide-git-failures (2026-03-31) 1 commit + (merged to 'next' on 2026-04-02 at fec00b153f) + + t7004: replace wc -l with modern test helpers + + Test clean-up. + source: <20260401062029.54757-1-r.siddharth.shrimali@gmail.com> + + +* tc/replay-ref (2026-04-01) 4 commits + (merged to 'next' on 2026-04-03 at 196ecde80b) + + replay: allow to specify a ref with option --ref + + replay: use stuck form in documentation and help message + + builtin/replay: mark options as not negatable + + Merge branch 'sa/replay-revert' into tc/replay-ref + + The experimental `git replay` command learned the `--ref=<ref>` option + to allow specifying which ref to update, overriding the default behavior. + source: <20260401-toon-replay-arbitrary-ref-v3-0-a0b4fabb34b3@iotcl.com> -------------------------------------------------- [Cooking] @@ -249,17 +355,17 @@ source: <20260403-includeif-worktree-v3-0-109ce5782b03@black-desk.cn> -* bc/rust-by-default-in-2.54 (2026-04-02) 4 commits +* bc/rust-by-default (2026-04-09) 4 commits - Enable Rust by default - Linux: link against libdl - ci: install cargo on Alpine - docs: update version with default Rust support Rust support is enabled by default (but still allows opting out) in - Git 2.54. + some future version of Git. - Will merge to 'next' after Git 2.53 final gets tagged. - source: <20260403011249.4133372-1-sandals@crustytoothpaste.net> + Will merge to 'next' after Git 2.54 final gets tagged. + source: <20260409224434.1861422-1-sandals@crustytoothpaste.net> * ps/shift-root-in-graph (2026-04-04) 1 commit @@ -296,69 +402,46 @@ * dl/cache-tree-fully-valid-fix (2026-04-06) 1 commit - - cache-tree: fix inverted object existence check in cache_tree_fully_valid + (merged to 'next' on 2026-04-13 at 68c82a9f37) + + cache-tree: fix inverted object existence check in cache_tree_fully_valid The check that implements the logic to see if an in-core cache-tree is fully ready to write out a tree object was broken, which has been corrected. - Will merge to 'next'? + Will cook in 'next'. source: <20260406192711.68870-1-davidlin@stripe.com> -* ds/rev-list-maximal-only-optim (2026-04-06) 3 commits - (merged to 'next' on 2026-04-07 at 7a70817efa) - + rev-list: use reduce_heads() for --maximal-only - + p6011: add perf test for rev-list --maximal-only - + t6600: test --maximal-only and --independent - - "git rev-list --maximal-only" has been optimized by borrowing the - logic used by "git show-branch --independent", which computes the - same kind of information much more efficiently. - - Will merge to 'master'. - source: <pull.2082.git.1775482048.gitgitgadget@gmail.com> - - * ja/doc-difftool-synopsis-style (2026-04-04) 4 commits - - doc: convert git-describe manual page to synopsis style - - doc: convert git-shortlog manual page to synopsis style - - doc: convert git-range-diff manual page to synopsis style - - doc: convert git-difftool manual page to synopsis style + (merged to 'next' on 2026-04-13 at 0e6c98f313) + + doc: convert git-describe manual page to synopsis style + + doc: convert git-shortlog manual page to synopsis style + + doc: convert git-range-diff manual page to synopsis style + + doc: convert git-difftool manual page to synopsis style Doc mark-up updates. - Will merge to 'next'? + Will cook in 'next'. source: <pull.2077.git.1775322767.gitgitgadget@gmail.com> -* kh/doc-config-list (2026-04-05) 2 commits - (merged to 'next' on 2026-04-07 at fb95f091cc) - + doc: gitcvs-migration: rephrase “man page” - + doc: replace git config --list/-l with `list` - - "git config list" is the official way to spell "git config -l" and - "git config --list". Use it to update the documentation. - - Will merge to 'master'. - source: <V2_CV_doc_deprecation_config_--list.569@msgid.xyz> - - -* lp/repack-propagate-promisor-debugging-info (2026-04-06) 6 commits - . SQUASH??? - . t7703: test for promisor file content after geometric repack - . t7700: test for promisor file content after repack - . repack-promisor: preserve content of promisor files after repack - . pack-write: add helper to fill promisor file after repack - . pack-write: add explanation to promisor file content +* lp/repack-propagate-promisor-debugging-info (2026-04-10) 7 commits + - SQUASH??? + - repack-promisor: add missing headers + - t7703: test for promisor file content after geometric repack + - t7700: test for promisor file content after repack + - repack-promisor: preserve content of promisor files after repack + - repack-promisor add helper to fill promisor file after repack + - pack-write: add explanation to promisor file content When fetching objects into a lazily cloned repository, .promisor files are created with information meant to help debugging. "git repack" has been taught to carry this information forward to packfiles that are newly created. - Expecting a reroll. - source: <cover.1775431990.git.lorenzo.pegorari2002@gmail.com> + Waiting for a review response on use of parse_pack_index() + source: <cover.1775861047.git.lorenzo.pegorari2002@gmail.com> * th/promisor-quiet-per-repo (2026-04-06) 1 commit @@ -376,6 +459,7 @@ - odb: update `struct odb_write_stream` read() callback - odb/transaction: use pluggable `begin_transaction()` - odb: split `struct odb_transaction` into separate header + (this branch is used by ps/odb-in-memory.) ODB transaction interface is being reworked to explicitly handle object writes. @@ -384,97 +468,6 @@ source: <20260402213220.2651523-1-jltobler@gmail.com> -* jd/cache-tree-trace-wo-the-repository (2026-03-31) 1 commit - (merged to 'next' on 2026-04-02 at e36937bb5e) - + cache-tree: use index state repository in trace2 calls - - Code cleanup. - - Will merge to 'master'. - source: <pull.2259.git.git.1774951373588.gitgitgadget@gmail.com> - - -* ps/reftable-portability (2026-04-02) 5 commits - (merged to 'next' on 2026-04-02 at 04adce37b9) - + reftable/system: add abstraction to mmap files - + reftable/system: add abstraction to retrieve time in milliseconds - + reftable/fsck: use REFTABLE_UNUSED instead of UNUSED - + reftable/stack: provide fsync(3p) via system header - + reftable: introduce "reftable-system.h" header - - Update reftable library part with what is used in libgit2 to improve - portability to different target codebases and platforms. - - Will merge to 'master'. - source: <20260402-pks-reftable-portability-fixes-v2-0-bc110cee0ae0@pks.im> - - -* jk/c23-const-preserving-fixes-more (2026-04-03) 13 commits - (merged to 'next' on 2026-04-06 at 9eebe11338) - + git-compat-util: fix CONST_OUTPARAM typo and indentation - (merged to 'next' on 2026-04-02 at b060d988f4) - + refs/files-backend: drop const to fix strchr() warning - + http: drop const to fix strstr() warning - + range-diff: drop const to fix strstr() warnings - + pkt-line: make packet_reader.line non-const - + skip_prefix(): check const match between in and out params - + pseudo-merge: fix disk reads from find_pseudo_merge() - + find_last_dir_sep(): convert inline function to macro - + run-command: explicitly cast away constness when assigning to void - + pager: explicitly cast away strchr() constness - + transport-helper: drop const to fix strchr() warnings - + http: add const to fix strchr() warnings - + convert: add const to fix strchr() warnings - - Further work to adjust the codebase for C23 that changes functions - like strchr() that discarded constness when they return a pointer into - a const string to preserve constness. - - Will merge to 'master'. - source: <20260402041433.GA3501120@coredump.intra.peff.net> - source: <20260404054211.GA1346444@coredump.intra.peff.net> - - -* ps/odb-cleanup (2026-03-31) 7 commits - (merged to 'next' on 2026-04-02 at 1dd8236dfb) - + odb: drop unneeded headers and forward decls - + odb: rename `odb_has_object()` flags - + odb: use enum for `odb_write_object` flags - + odb: rename `odb_write_object()` flags - + treewide: use enum for `odb_for_each_object()` flags - + CodingGuidelines: document our style for flags - + Merge branch 'ps/odb-generic-object-name-handling' into ps/odb-cleanup - (this branch is used by ps/odb-in-core.) - - Various code clean-up around odb subsystem. - - Will merge to 'master'. - source: <20260401-pks-odb-cleanups-v1-0-89adba9ada68@pks.im> - - -* ss/t7004-unhide-git-failures (2026-03-31) 1 commit - (merged to 'next' on 2026-04-02 at fec00b153f) - + t7004: replace wc -l with modern test helpers - - Test clean-up. - - Will merge to 'master'. - source: <20260401062029.54757-1-r.siddharth.shrimali@gmail.com> - - -* ng/add-files-to-cache-wo-rename (2026-04-01) 1 commit - (merged to 'next' on 2026-04-02 at 8723880fc0) - + read-cache: disable renames in add_files_to_cache - - add_files_to_cache() used diff_files() to detect only the paths that - are different between the index and the working tree and add them, - which does not need rename detection, which interfered with unnecessary - conflicts. - - Will merge to 'master'. - source: <20260401190033.11325-1-blindmansion@gmail.com> - - * sa/cat-file-batch-mailmap-switch (2026-03-31) 1 commit - cat-file: add mailmap subcommand to --batch-command @@ -552,29 +545,21 @@ source: <20260330-pks-setup-wo-the-repository-v1-0-0d2e822837aa@pks.im> -* kh/doc-trailers (2026-03-30) 2 commits +* kh/doc-trailers (2026-04-13) 9 commits + - doc: interpret-trailers: document comment line treatment + - doc: interpret-trailers: commit to “trailer block” term + - doc: interpret-trailers: add key format example - doc: interpret-trailers: explain key format + - doc: interpret-trailers: explain the format after the intro + - doc: interpret-trailers: not just for commit messages + - doc: interpret-trailers: use “metadata” in Name as well + - doc: interpret-trailers: replace “lines” with “metadata” - doc: interpret-trailers: stop fixating on RFC 822 Documentation updates. - Expecting a reroll. - cf. <5ba0bbcb-25a7-4ad0-ac1d-c86508eaffdd@app.fastmail.com> - source: <CV_doc_int-tr_key_format.533@msgid.xyz> - - -* tc/replay-ref (2026-04-01) 4 commits - (merged to 'next' on 2026-04-03 at 196ecde80b) - + replay: allow to specify a ref with option --ref - + replay: use stuck form in documentation and help message - + builtin/replay: mark options as not negatable - + Merge branch 'sa/replay-revert' into tc/replay-ref - - The experimental `git replay` command learned the `--ref=<ref>` option - to allow specifying which ref to update, overriding the default behavior. - - Will merge to 'master'. - source: <20260401-toon-replay-arbitrary-ref-v3-0-a0b4fabb34b3@iotcl.com> + Needs review. + source: <V2_CV_doc_int-tr_key_format.613@msgid.xyz> * ps/graph-lane-limit (2026-03-27) 3 commits @@ -592,21 +577,22 @@ * cc/promisor-auto-config-url (2026-04-07) 10 commits - - t5710: use proper file:// URIs for absolute paths - - promisor-remote: remove the 'accepted' strvec - - promisor-remote: keep accepted promisor_info structs alive - - promisor-remote: refactor accept_from_server() - - promisor-remote: refactor has_control_char() - - promisor-remote: refactor should_accept_remote() control flow - - promisor-remote: reject empty name or URL in advertised remote - - promisor-remote: clarify that a remote is ignored - - promisor-remote: pass config entry to all_fields_match() directly - - promisor-remote: try accepted remotes before others in get_direct() + (merged to 'next' on 2026-04-13 at 289fcba081) + + t5710: use proper file:// URIs for absolute paths + + promisor-remote: remove the 'accepted' strvec + + promisor-remote: keep accepted promisor_info structs alive + + promisor-remote: refactor accept_from_server() + + promisor-remote: refactor has_control_char() + + promisor-remote: refactor should_accept_remote() control flow + + promisor-remote: reject empty name or URL in advertised remote + + promisor-remote: clarify that a remote is ignored + + promisor-remote: pass config entry to all_fields_match() directly + + promisor-remote: try accepted remotes before others in get_direct() Promisor remote handling has been refactored and fixed in preparation for auto-configuration of advertised remotes. - Will merge to 'next'? + Will cook in 'next'. source: <20260407115243.358642-1-christian.couder@gmail.com> @@ -635,19 +621,20 @@ source: <20260325190906.1153080-1-usmanakinyemi202@gmail.com> -* hn/git-checkout-m-with-stash (2026-03-17) 4 commits - - checkout: -m (--merge) uses autostash when switching branches - - sequencer: teach autostash apply to take optional conflict marker labels - - sequencer: allow create_autostash to run silently - - stash: add --ours-label, --theirs-label, --base-label for apply +* hn/git-checkout-m-with-stash (2026-04-12) 4 commits + (merged to 'next' on 2026-04-13 at b4e5a964fa) + + checkout: -m (--merge) uses autostash when switching branches + + sequencer: teach autostash apply to take optional conflict marker labels + + sequencer: allow create_autostash to run silently + + stash: add --label-ours, --label-theirs, --label-base for apply "git checkout -m another-branch" was invented to deal with local changes to paths that are different between the current and the new branch, but it gave only one chance to resolve conflicts. The command was taught to create a stash to save the local changes. - Needs review. - source: <pull.2234.v6.git.git.1773740139.gitgitgadget@gmail.com> + Will cook in 'next'. + source: <pull.2234.v10.git.git.1775994705.gitgitgadget@gmail.com> * kh/name-rev-custom-format (2026-03-20) 2 commits @@ -749,50 +736,50 @@ source: <pull.2224.v3.git.git.1773238778894.gitgitgadget@gmail.com> -* pt/fsmonitor-linux (2026-04-07) 14 commits - - SQUASH??? - - fsmonitor: convert shown khash to strset in do_handle_client - - fsmonitor: add tests for Linux - - fsmonitor: add timeout to daemon stop command - - fsmonitor: close inherited file descriptors and detach in daemon - - run-command: add close_fd_above_stderr option - - fsmonitor: implement filesystem change listener for Linux - - fsmonitor: rename fsm-settings-darwin.c to fsm-settings-unix.c - - fsmonitor: rename fsm-ipc-darwin.c to fsm-ipc-unix.c - - fsmonitor: use pthread_cond_timedwait for cookie wait - - compat/win32: add pthread_cond_timedwait - - fsmonitor: fix hashmap memory leak in fsmonitor_run_daemon - - fsmonitor: fix khash memory leak in do_handle_client - - t9210: disable GIT_TEST_SPLIT_INDEX for scalar clone tests +* pt/fsmonitor-linux (2026-04-08) 13 commits + (merged to 'next' on 2026-04-13 at 37fa47889d) + + fsmonitor: convert shown khash to strset in do_handle_client + + fsmonitor: add tests for Linux + + fsmonitor: add timeout to daemon stop command + + fsmonitor: close inherited file descriptors and detach in daemon + + run-command: add close_fd_above_stderr option + + fsmonitor: implement filesystem change listener for Linux + + fsmonitor: rename fsm-settings-darwin.c to fsm-settings-unix.c + + fsmonitor: rename fsm-ipc-darwin.c to fsm-ipc-unix.c + + fsmonitor: use pthread_cond_timedwait for cookie wait + + compat/win32: add pthread_cond_timedwait + + fsmonitor: fix hashmap memory leak in fsmonitor_run_daemon + + fsmonitor: fix khash memory leak in do_handle_client + + t9210, t9211: disable GIT_TEST_SPLIT_INDEX for scalar clone tests The fsmonitor daemon has been implemented for Linux. - Expecting a reroll. - cf. <xmqqika24mj0.fsf@gitster.g> - source: <pull.2147.v13.git.git.1775498098.gitgitgadget@gmail.com> + Will cook in 'next'. + source: <pull.2147.v14.git.git.1775710775.gitgitgadget@gmail.com> -* ar/parallel-hooks (2026-04-04) 13 commits - - hook: allow hook.jobs=-1 to use all available CPU cores - - hook: add hook.<event>.enabled switch - - hook: move is_known_hook() to hook.c for wider use - - hook: warn when hook.<friendly-name>.jobs is set - - hook: add per-event jobs config - - hook: add -j/--jobs option to git hook run - - hook: mark non-parallelizable hooks - - hook: allow pre-push parallel execution - - hook: allow parallel hook execution - - hook: parse the hook.jobs config - - config: add a repo_config_get_uint() helper - - repository: fix repo_init() memleak due to missing _clear() - - Merge branch 'ar/config-hook-cleanups' into ar/parallel-hooks +* ar/parallel-hooks (2026-04-10) 13 commits + (merged to 'next' on 2026-04-13 at 0a6acf0d17) + + t1800: test SIGPIPE with parallel hooks + + hook: allow hook.jobs=-1 to use all available CPU cores + + hook: add hook.<event>.enabled switch + + hook: move is_known_hook() to hook.c for wider use + + hook: warn when hook.<friendly-name>.jobs is set + + hook: add per-event jobs config + + hook: add -j/--jobs option to git hook run + + hook: mark non-parallelizable hooks + + hook: allow pre-push parallel execution + + hook: allow parallel hook execution + + hook: parse the hook.jobs config + + config: add a repo_config_get_uint() helper + + repository: fix repo_init() memleak due to missing _clear() - Will merge to 'next'? - source: <20260404082934.173788-1-adrian.ratiu@collabora.com> + Will cook in 'next'. + source: <20260410090608.75283-1-adrian.ratiu@collabora.com> -* en/xdiff-cleanup-3 (2026-03-30) 6 commits - - xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarity +* en/xdiff-cleanup-3 (2026-04-08) 6 commits + - xdiff/xdl_cleanup_records: put braces around the else clause - xdiff/xdl_cleanup_records: make setting action easier to follow - xdiff/xdl_cleanup_records: make limits more clear - xdiff/xdl_cleanup_records: use unambiguous types @@ -802,6 +789,5 @@ Preparation of the xdiff/ codebase to work with Rust. - Changes the behaviour without meaning to, which needs fixing. - cf. <87a54698-396d-4de8-bd9d-cd72f8d1e8df@gmail.com> - source: <pull.2156.v4.git.git.1774890003.gitgitgadget@gmail.com> + Will merge to 'next'? + source: <pull.2156.v5.git.git.1775679988.gitgitgadget@gmail.com>