{"thread":{"id":"65872","subject":"What's cooking in git.git (Jun 2026, #10)","startedAt":"2026-06-26T00:30:19Z","lastAt":"2026-06-30T19:27:43Z","messageCount":3,"participants":["Junio C Hamano","Toon Claes"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"546437","messageId":"xmqq5x36dtyf.fsf@gitster.g","threadId":"65872","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2026, #10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-06-26T00:30:16Z","receivedAt":"2026-06-26T00:30:19Z","isPatch":false,"body":"Here are the topics that have been cooking in my tree. Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and is a candidate to be in a\nfuture release). Commits prefixed with '-' are only in 'seen', and\naren't considered \"accepted\" at all and may be annotated with a URL\nto a message that raises issues but they are by no means exhaustive.\nA topic without enough support may be discarded after a long period\nof no activity (of course they can be resubmitted when new interests\narise).\n\nGit 2.55-rc2 has been tagged. The tree is in deep feature-freeze,\nand remaining topics in 'next' will stay in \"Will cook in 'next'\"\ninstead of \"Will merge to 'master'\" state, until Git 2.55 final.\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors. Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-scm/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[New Topics]\n\n* ad/gpg-strip-cr-before-lf (2026-06-24) 1 commit\n - gpg-interface: fix strip_cr_before_lf to only remove CR before LF\n\n The GPG and SSH signature parsing code has been corrected to strip\n carriage return characters only when they immediately precede line\n feeds, instead of unconditionally stripping all carriage returns.\n\n Needs review.\n source: <20260624093618.17456-1-antonio.destefani08@gmail.com>\n\n\n* jt/receive-pack-use-odb-transactions (2026-06-23) 6 commits\n - builtin/receive-pack: stage incoming objects via ODB transactions\n - odb/transaction: add transaction env interface\n - odb/transaction: propagate commit errors\n - odb/transaction: propagate begin errors\n - object-file: propagate files transaction errors\n - object-file: rename files transaction prepare function\n\n git-receive-pack has been refactored to use ODB transaction\n interfaces instead of directly managing tmp_objdir for staging\n incoming objects, bringing it closer to being ODB backend agnostic.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260624041920.2601961-1-jltobler@gmail.com>\n\n\n* ps/odb-drop-whence (2026-06-24) 7 commits\n - odb: document object info fields\n - odb: drop `whence` field from object info\n - treewide: convert users of `whence` to the new source field\n - odb: add `source` field to struct object_info_source\n - odb: make backend-specific fields optional\n - packfile: thread odb_source_packed through packed_object_info()\n - Merge branch 'ps/odb-source-packed' into ps/odb-drop-whence\n (this branch uses ps/odb-source-packed.)\n\n The whence field in struct object_info has been removed,\n refactoring backend-specific object information retrieval into an\n opt-in struct object_info_source structure.\n\n Needs review.\n source: <20260624-b4-pks-odb-drop-whence-v1-0-8d1877b790ac@pks.im>\n\n\n* ps/reftable-hardening (2026-06-24) 11 commits\n - reftable/table: fix OOB read on truncated table\n - reftable/table: fix NULL pointer access when seeking to bogus offsets\n - reftable/block: fix OOB read with bogus restart offset\n - reftable/block: fix use of uninitialized memory when binsearch fails\n - reftable/block: fix OOB read with bogus restart count\n - reftable/block: fix OOB read with bogus block size\n - reftable/block: fix OOB write with bogus inflated log size\n - reftable/record: don't abort when decoding invalid ref value type\n - reftable/basics: fix OOB read on binary search of empty range\n - oss-fuzz: add fuzzer for parsing reftables\n - meson: support building fuzzers with libFuzzer\n\n The reftable code has been hardened against corrupted tables by\n fixing out-of-bounds writes, out-of-bounds reads, and abort calls\n during parsing.\n\n Needs review.\n source: <20260624-pks-reftable-hardening-v1-0-66e4ce87c6b9@pks.im>\n\n\n* hn/branch-push-slip-advice (2026-06-24) 3 commits\n - SQUASH??? use test_grep\n - push: suggest for a slash slip\n - branch: suggest / on upstream slip\n\n \"git push origin/main\" and \"git branch origin main\" could both be\n an obvious typo, in which case offer the obvious typofix.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: \n\n\n* jc/history-message-prep-fix (2026-06-25) 1 commit\n - history: streamline message preparation and plug file stream leak\n\n Code clean-up with leakfix for a write file stream.\n\n Needs review.\n source: \n\n\n* ty/migrate-excludes-file (2026-06-25) 2 commits\n - environment: move excludes_file into repo_config_values\n - dir: encapsulate excludes_file lazy-load\n\n Move excludes_file global variable into per-repository structure.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260625161845.7543-1-cat@malon.dev>\n\n--------------------------------------------------\n[Stalled]\n\n* jt/config-lock-timeout (2026-05-17) 1 commit\n - config: retry acquiring config.lock, configurable via core.configLockTimeout\n\n Configuration file locking now retries for a short period, avoiding\n failures when multiple processes attempt to update the configuration\n simultaneously.\n\n Waiting for response(s) to review comment(s) for too long, stalled.\n cf. \n source: <20260517132111.1014901-1-joerg@thalheim.io>\n\n\n* js/parseopt-subcommand-autocorrection (2026-04-27) 11 commits\n - SQUASH???\n - doc: document autocorrect API\n - parseopt: add tests for subcommand autocorrection\n - parseopt: enable subcommand autocorrection for git-remote and git-notes\n - parseopt: autocorrect mistyped subcommands\n - autocorrect: provide config resolution API\n - autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT\n - autocorrect: use mode and delay instead of magic numbers\n - help: move tty check for autocorrection to autocorrect.c\n - help: make autocorrect handling reusable\n - parseopt: extract subcommand handling from parse_options_step()\n\n The parse-options library learned to auto-correct misspelled\n subcommand names.\n\n Waiting for response(s) to review comment(s) for too long, stalled.\n cf. \n cf. \n source: \n\n\n* cl/conditional-config-on-worktree-path (2026-05-24) 2 commits\n - config: add \"worktree\" and \"worktree/i\" includeIf conditions\n - config: refactor include_by_gitdir() into include_by_path()\n\n The [includeIf \"condition\"] conditional inclusion facility for\n configuration files has learned to use the location of worktree\n in its condition.\n\n Waiting for response(s) to review comment(s) for too long, stalled.\n cf. \n source: <20260525-includeif-worktree-v5-0-1efe525d025a@black-desk.cn>\n\n--------------------------------------------------\n[Cooking]\n\n* kk/merge-base-exhaustion (2026-06-24) 7 commits\n - commit-reach: terminate merge-base walk when one paint side is exhausted\n - commit-reach: remove unused nonstale_queue dedup wrappers\n - commit-reach: introduce struct paint_state with per-side counters\n - commit-reach: add trace2 instrumentation to paint_down_to_common()\n - t6099, t6600: add side-exhaustion regression tests\n - t6600: add test cases for side-exhaustion edge cases\n - Documentation/technical: add paint-down-to-common doc\n\n The merge-base computation has been optimized by stopping the walk\n early when one side's exclusive commits in the queue are exhausted,\n yielding significant speedups for queries with one-sided histories.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* dk/meson-enable-use-nsec-build (2026-06-20) 1 commit\n - meson: wire up USE_NSEC build knob\n\n The USE_NSEC build knob, which enables support for sub-second file\n timestamp resolution, has been wired up to the Meson build system.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: \n\n\n* ps/connected-generic-promisor-checks (2026-06-25) 5 commits\n - connected: search promisor objects generically\n - connected: split out promisor-based connectivity check\n - odb/source-packed: support flags when iterating an object prefix\n - odb/source-packed: extract logic to skip certain packs\n - Merge branch 'ps/odb-source-packed' into ps/connected-generic-promisor-checks\n (this branch uses ps/odb-source-packed.)\n\n The connectivity check has been refactored to search for promisor\n objects in a generic way using the object database interface,\n rather than iterating packfiles directly. This allows connectivity\n checks to work properly in repositories that do not use packfiles.\n\n Will merge to 'next'?\n cf. \n source: <20260625-pks-connected-generic-promisor-checks-v3-0-7308f3b9dc44@pks.im>\n\n\n* ps/libgit-in-subdir (2026-06-22) 3 commits\n - Move libgit.a sources into separate \"lib/\" directory\n - t/helper: prepare \"test-example-tap.c\" for introduction of \"lib/\"\n - Merge branch 'ps/odb-source-packed' into ps/libgit-in-subdir\n (this branch uses ps/odb-source-packed.)\n\n The source files for libgit.a have been moved into a new \"lib/\"\n directory to clean up the top-level directory and clearly separate\n library code.\n\n Needs review.\n source: <20260622-pks-libgit-in-subdir-v2-0-cb946c51ee7b@pks.im>\n\n\n* ps/odb-generalize-prepare (2026-06-22) 3 commits\n - odb: introduce `odb_prepare()`\n - odb/source: generalize `reprepare()` callback\n - Merge branch 'ps/odb-source-packed' into ps/odb-generalize-prepare\n (this branch uses ps/odb-source-packed.)\n\n The `reprepare()` callback for object database sources has been\n generalized into a `prepare()` callback with an optional flush cache\n flag, and a new `odb_prepare()` wrapper has been introduced to\n allow pre-opening object database sources.\n\n Needs review.\n source: <20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>\n\n\n* jc/submittingpatches-design-critiques (2026-06-20) 1 commit\n (merged to 'next' on 2026-06-22 at 7495b5f9d6)\n + SubmittingPatches: address design critiques\n\n The documentation in SubmittingPatches has been updated to clarify how\n patch contributors should respond to design and viability critiques,\n and how the resolution of such critiques should be recorded in the\n final commit messages.\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* wy/doc-clarify-review-replies (2026-06-21) 2 commits\n - doc: advise batching patch rerolls\n - doc: encourage review replies before rerolling\n\n Documentation on community contribution guidelines has been updated to\n encourage replying to review comments before rerolling, and to advise\n a default limit of at most one reroll per day to give reviewers across\n different time zones enough time to participate.\n\n Will merge to 'next'?\n cf. \n source: \n\n\n* ty/migrate-ignorecase (2026-06-19) 2 commits\n - config: use repo_ignore_case() to access core.ignorecase\n - environment: move ignore_case into repo_config_values\n\n The global configuration variable ignore_case (representing the\n core.ignorecase configuration) has been migrated into struct\n repo_config_values to tie it to a specific repository instance.\n\n Waiting for comments from Johannes.\n cf. \n source: <20260619155152.642760-1-cat@malon.dev>\n\n\n* mm/line-log-limited-ops (2026-06-18) 7 commits\n - diffcore-pickaxe: scope -G to the -L tracked range\n - diff: support --check with -L line ranges\n - line-log: support diff stat formats with -L\n - diff: extract a line-range diff helper for reuse\n - diff: emit -L hunk headers via xdiff's formatter\n - diff: simplify the line-range filter by classifying removals immediately\n - diff: rename and group the line-range filter for clarity\n\n \"git log -L:\" learned to limit various \"diff\" operations\n like --stat, --check, -G, to the specified range:path.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* hn/history-squash (2026-06-24) 4 commits\n - history: re-edit a squash with every message\n - history: add squash subcommand to fold a range\n - history: give commit_tree_ext a message template\n - history: extract helper for a commit's parent tree\n\n The experimental \"git history\" command has been taught a new\n \"squash\" subcommand to fold a range of commits into a single commit,\n replaying any descendants on top.\n\n Needs review.\n source: \n\n\n* ps/t4216-tap-fix (2026-06-19) 1 commit\n (merged to 'next' on 2026-06-25 at 42296fc12e)\n + t4216: fix no-op test that breaks TAP output\n\n TAP output breakage fix.\n\n Will merge to 'master'.\n cf. \n source: <20260619-pks-t4216-drop-unused-prereq-v1-1-2ce0d7bea088@pks.im>\n\n\n* mh/fetch-follow-remote-head-config (2026-06-19) 8 commits\n (merged to 'next' on 2026-06-22 at 423079e1c8)\n + fetch: fixup a misaligned comment\n + fetch: add configuration variable fetch.followRemoteHEAD\n + fetch: refactor do_fetch handling of followRemoteHEAD\n + fetch: return 0 on known git_fetch_config\n + fetch: rename function report_set_head\n + t5510: cleanup remote in followRemoteHEAD dangling ref test\n + doc: explain fetchRemoteHEADWarn advice\n + fetch: fixup set_head advice for warn-if-not-branch\n\n The `fetch.followRemoteHEAD` configuration variable has been added to\n provide a default for the per-remote `remote..followRemoteHEAD`\n setting.\n\n Will cook in 'next'.\n cf. \n source: <20260619094751.2996804-1-m@lfurio.us>\n\n\n* ps/refs-writing-subcommands (2026-06-17) 5 commits\n - builtin/refs: add \"rename\" subcommand\n - builtin/refs: add \"create\" subcommand\n - builtin/refs: add \"update\" subcommand\n - builtin/refs: add \"delete\" subcommand\n - builtin/refs: drop `the_repository`\n\n The \"git refs\" toolbox has been extended with new \"create\", \"delete\",\n \"update\", and \"rename\" subcommands to create, delete, update, and\n rename references, respectively.\n\n Needs review.\n source: <20260617-pks-refs-writing-subcommands-v2-0-07f3d18336f9@pks.im>\n\n\n* po/hash-object-size-t (2026-06-16) 6 commits\n (merged to 'next' on 2026-06-21 at b780a276b9)\n + hash-object: add a >4GB/LLP64 test case using filtered input\n + hash-object: add another >4GB/LLP64 test case\n + hash-object --stdin: verify that it works with >4GB/LLP64\n + hash algorithms: use size_t for section lengths\n + object-file.c: use size_t for header lengths\n + hash-object: demonstrate a >4GB/LLP64 problem\n\n Support for hashing loose or packed objects larger than 4GB on Windows\n and other LLP64 platforms has been improved by converting object header\n buffers and data-handling functions from 'unsigned long' to 'size_t'.\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* kh/submittingpatches-trailers (2026-06-18) 5 commits\n (merged to 'next' on 2026-06-22 at 2cd4a152c9)\n + SubmittingPatches: note that trailer order matters\n + SubmittingPatches: be consistent with trailer markup\n + SubmittingPatches: document Based-on-patch-by trailer\n + SubmittingPatches: discourage common Linux trailers\n + SubmittingPatches: encourage trailer use for substantial help\n\n The trailer sections in SubmittingPatches have been updated to\n encourage use of standard trailers.\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* mv/log-follow-mergy (2026-06-21) 1 commit\n (merged to 'next' on 2026-06-22 at f7e984a003)\n + log: improve --follow following renames for non-linear history\n\n \"git log --follow\" has been updated to handle non-linear history, in\n which the path being tracked gets renamed differently in multiple\n history lines, better.\n\n Will cook in 'next'.\n source: \n\n\n* wy/doc-myfirstcontribution-trim-quotes (2026-06-11) 1 commit\n - MyFirstContribution: mention trimming quoted text in replies\n\n The contributor guide has been updated to advise new contributors to\n trim irrelevant quoted text when replying to review comments, matching\n the existing advice given to reviewers.\n\n Comments?\n cf. \n source: <080402ff0ac8127b654dccea59a1bf643df62a5c.1781186476.git.wy@wyuan.org>\n\n\n* tb/midx-incremental-custom-base (2026-06-12) 3 commits\n - midx-write: include packs above custom incremental base\n - midx: pass custom '--base' through incremental writes\n - t5334: expose shared `nth_line()` helper\n\n The `git multi-pack-index write --incremental` command has been\n corrected to properly honor the `--base` option. Previously, the\n custom base was ignored by the normal write path, and the pack\n exclusion logic incorrectly skipped packs from layers above the\n selected base, breaking reachability closure for bitmaps.\n\n Needs review.\n source: \n\n\n* mm/test-grep-lint (2026-06-12) 6 commits\n - t: add greplint to detect bare grep assertions\n - t: convert grep assertions to test_grep\n - t: fix Lexer line count for $() inside double-quoted strings\n - t: extract chainlint's parser into shared module\n - t: fix grep assertions missing file arguments\n - t/README: document test_grep helper\n\n Needs review.\n source: \n\n\n* rs/cat-file-default-format-optim (2026-06-14) 1 commit\n (merged to 'next' on 2026-06-17 at 43ed8b3969)\n + cat-file: speed up default format\n\n Will cook in 'next'.\n cf. <20260615165326.GA91269@coredump.intra.peff.net>\n source: <5a7ed929-6fe0-496c-83bd-65dee57c2241@web.de>\n\n\n* kk/prio-queue-get-put-fusion (2026-06-08) 2 commits\n - prio-queue: fold lazy_queue into prio_queue for automatic get+put fusion\n - prio-queue: rename .nr to .nr_ and add accessor helpers\n\n The lazy priority queue optimization pattern (deferring actual removal\n in prio_queue_get() to allow get+put fusion) has been folded directly\n into prio_queue itself, speeding up commit traversal workflows and\n simplifying callers.\n\n On hold, waiting for kk/prio-queue-get-put-fusion to land first.\n cf. \n source: \n\n\n* td/ref-filter-memoize-contains (2026-06-12) 3 commits\n - commit-reach: die on contains walk errors\n - ref-filter: memoize --contains with generations\n - commit-reach: reject cycles in contains walk\n\n 'git branch --contains' and 'git for-each-ref --contains' have\n been optimized to use the memoized commit traversal previously\n used only by 'git tag --contains', significantly speeding up\n connectivity checks across many candidate refs with shared\n history.\n\n Needs review.\n source: <20260612-ref-filter-memoized-contains-v4-0-5ed39fd001dd@gmail.com>\n\n\n* tc/replay-linearize (2026-06-22) 3 commits\n - replay: offer an option to linearize the commit topology\n - replay: add helper to put entry into mapped_commits\n - replay: refactor enum replay_mode into a bool\n\n git replay learns --linearize option to drop merge commits and\n linearize the replayed history, mimicking git rebase\n --no-rebase-merges.\n\n Expecting a reroll.\n cf. <87tsqrycke.fsf@emacs.iotcl.com>\n source: <20260622-toon-git-replay-drop-merges-v4-0-ff257f534319@iotcl.com>\n\n\n* ps/setup-drop-global-state (2026-06-10) 8 commits\n (merged to 'next' on 2026-06-15 at d9a8b88d47)\n + treewide: drop USE_THE_REPOSITORY_VARIABLE\n + environment: stop using `the_repository` in `is_bare_repository()`\n + environment: split up concerns of `is_bare_repository_cfg`\n + builtin/init: stop modifying `is_bare_repository_cfg`\n + setup: remove global `git_work_tree_cfg` variable\n + builtin/init: simplify logic to configure worktree\n + builtin/init: stop modifying global `git_work_tree_cfg` variable\n + Merge branch 'ps/setup-centralize-odb-creation' into ps/setup-drop-global-state\n\n Continuation of \"setup.c\" refactoring to drop remaining global state\n (`git_work_tree_cfg`, `is_bare_repository_cfg`). The most notable\n outcome is that `is_bare_repository()` has been updated to no longer\n implicitly rely on `the_repository`.\n\n Will cook in 'next'.\n cf. \n cf. <87ldckyygk.fsf@emacs.iotcl.com>\n source: <20260611-b4-pks-setup-drop-global-state-v2-0-a6f7269c841d@pks.im>\n\n\n* ps/refs-avoid-chdir-notify-reparent (2026-06-25) 12 commits\n - refs: protect against chicken-and-egg recursion\n - refs/reftable: lazy-load configuration to fix chicken-and-egg\n - reftable: split up write options\n - refs/files: lazy-load configuration to fix chicken-and-egg\n - refs: move parsing of \"core.logAllRefUpdates\" back into ref stores\n - repository: free main reference database\n - chdir-notify: drop unused `chdir_notify_reparent()`\n - refs: unregister reference stores from \"chdir_notify\"\n - setup: don't apply \"GIT_REFERENCE_BACKEND\" without a repository\n - setup: stop applying repository format twice\n - setup: inline `check_and_apply_repository_format()`\n - Merge branch 'ps/setup-centralize-odb-creation' into ps/refs-avoid-chdir-notify-reparent\n\n The reference backends have been converted to always use absolute\n paths internally. This allows dropping the calls to\n `chdir_notify_reparent()` and fixes a memory leak in how the\n reference database is constructed with an \"onbranch\" condition.\n\n Will merge to 'next'?\n cf. \n source: <20260625-b4-pks-refs-avoid-chdir-notify-reparent-v6-0-41fbca3cf5e3@pks.im>\n\n\n* ps/odb-source-packed (2026-06-16) 18 commits\n (merged to 'next' on 2026-06-19 at dcf0c084e4)\n + odb/source-packed: drop pointer to \"files\" parent source\n + midx: refactor interfaces to work on \"packed\" source\n + odb/source-packed: stub out remaining functions\n + odb/source-packed: wire up `freshen_object()` callback\n + odb/source-packed: wire up `find_abbrev_len()` callback\n + odb/source-packed: wire up `count_objects()` callback\n + odb/source-packed: wire up `for_each_object()` callback\n + odb/source-packed: wire up `read_object_stream()` callback\n + odb/source-packed: wire up `read_object_info()` callback\n + packfile: use higher-level interface to implement `has_object_pack()`\n + odb/source-packed: wire up `reprepare()` callback\n + odb/source-packed: wire up `close()` callback\n + odb/source-packed: start converting to a proper `struct odb_source`\n + odb/source-packed: store pointer to \"files\" instead of generic source\n + packfile: move packed source into \"odb/\" subsystem\n + packfile: split out packfile list logic\n + packfile: rename `struct packfile_store` to `odb_source_packed`\n + Merge branch 'ps/odb-source-loose' into ps/odb-source-packed\n (this branch is used by ps/connected-generic-promisor-checks, ps/libgit-in-subdir, ps/odb-drop-whence and ps/odb-generalize-prepare.)\n\n The packed object source has been refactored into a proper struct\n odb_source.\n\n Will cook in 'next'.\n cf. \n source: <20260617-pks-odb-source-packed-v3-0-b5c7583cd795@pks.im>\n\n\n* td/ref-filter-restore-prefix-iteration (2026-06-12) 1 commit\n (merged to 'next' on 2026-06-19 at a19dbb4193)\n + ref-filter: restore prefix-scoped iteration\n\n Commands that list branches and tags (like git branch and git tag)\n have been optimized to pass the namespace prefix when initializing\n their ref iterator, avoiding a loose-ref scaling regression in\n repositories with many unrelated loose references.\n\n Will cook in 'next'.\n cf. \n source: <20260612-fix-git-branch-regression-v4-1-f150038c02f4@gmail.com>\n\n\n* ty/move-protect-hfs-ntfs (2026-06-20) 2 commits\n (merged to 'next' on 2026-06-20 at d8ca0d5180)\n + environment: use 'repo->initialized' for repo_protect_hfs() and repo_protect_ntfs()\n (merged to 'next' on 2026-06-15 at c2a30ca954)\n + environment: move 'protect_hfs' and 'protect_ntfs' into 'repo_config_values'\n\n The global configuration variables protect_hfs and protect_ntfs have\n been migrated into struct repo_config_values to tie them to\n per-repository configuration state.\n\n Will cook in 'next'.\n cf. \n cf. \n source: <20260610124353.149874-2-cat@malon.dev>\n source: <20260620140957.667820-1-cat@malon.dev>\n\n\n* ps/cat-file-remote-object-info (2026-06-25) 13 commits\n - cat-file: make remote-object-info allow-list dynamic\n - cat-file: validate remote atoms with allow_list\n - cat-file: add remote-object-info to batch-command\n - transport: add client support for object-info\n - serve: advertise object-info feature\n - fetch-pack: move fetch initialization\n - connect: refactor packet writing\n - fetch-pack: move function to connect.c\n - fetch-pack: prepare function to be moved\n - t1006: split test utility functions into new \"lib-cat-file.sh\"\n - cat-file: declare loop counter inside for()\n - git-compat-util: add strtoul_szt() with error handling\n - transport-helper: fix memory leak of helper on disconnect\n\n The `remote-object-info` command has been added to `git cat-file\n --batch-command`, allowing clients to request object metadata\n (currently size) from a remote server via protocol v2 without\n downloading the entire object.\n\n The client dynamically filters format placeholders based on\n server-advertised capabilities and safely returns empty strings for\n inapplicable or unsupported fields.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260625-ps-eric-work-rebase-v14-0-09f7ffe21a53@gmail.com>\n\n\n* ap/http-redirect-wwwauth-fix (2026-06-02) 1 commit\n - http: preserve wwwauth_headers across redirects\n\n When cURL follows a redirect, the WWW-Authenticate headers from the\n redirect target were lost because credential_from_url() cleared the\n credential state. This has been fixed by preserving the collected\n headers across the redirect update.\n\n Expecting a reroll.\n cf. <5144a29d-a53f-4446-beff-e1f549345bf9@nvidia.com>\n source: <20260602161150.1527493-1-aplattner@nvidia.com>\n\n\n* ps/doc-recommend-b4 (2026-06-15) 3 commits\n (merged to 'next' on 2026-06-17 at dd9a463369)\n + b4: introduce configuration for the Git project\n + MyFirstContribution: recommend the use of b4\n + MyFirstContribution: recommend shallow threading of cover letters\n\n Project-specific configuration for b4 has been introduced, and the\n documentation has been updated to recommend using it as a\n streamlined method for submitting patches.\n\n Will cook in 'next'.\n cf. <87eci7yomp.fsf@emacs.iotcl.com>\n source: <20260615-pks-b4-v4-0-22cfca8f19c5@pks.im>\n\n\n* sn/rebase-update-refs-symrefs (2026-06-03) 1 commit\n - rebase: skip branch symref aliases\n\n \"git rebase --update-refs\" has been taught to resolve local branch\n symrefs to their referents before queuing updates. This correctly\n skips aliases of the current branch and avoids duplicate updates for\n underlying real branches, fixing failures when branch aliases (like a\n default branch rename) are present.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: \n\n\n* mm/diff-process-hunks (2026-06-14) 6 commits\n - blame: consult diff process for no-hunk detection\n - diff: bypass diff process with --no-ext-diff and in format-patch\n - diff: add long-running diff process via diff..process\n - sub-process: separate process lifecycle from hashmap management\n - userdiff: add diff..process config\n - xdiff: support external hunks via xpparam_t\n\n A new `diff..process` configuration has been introduced to\n allow a long-running external process to act as a hunk provider to\n allows external tools to control which lines Git considers changed\n while leaving all output formatting (word diff, color, blame, etc.) to\n Git's standard pipeline.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* tb/pack-path-walk-bitmap-delta-islands (2026-06-21) 5 commits\n (merged to 'next' on 2026-06-22 at 59cf1663e7)\n + pack-objects: support `--delta-islands` with `--path-walk`\n + pack-objects: extract `record_tree_depth()` helper\n + pack-objects: support reachability bitmaps with `--path-walk`\n + t/perf: drop p5311's lookup-table permutation\n + Merge branch 'ds/path-walk-filters' into tb/pack-path-walk-bitmap-delta-islands\n\n The pack-objects command now supports using reachability bitmaps and\n delta-islands concurrently with the `--path-walk` option, allowing\n faster packaging by falling back to path-walk when bitmaps cannot\n fully satisfy the request.\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* ty/migrate-trust-executable-bit (2026-06-19) 3 commits\n - environment: move trust_executable_bit into repo_config_values\n - read-cache: move 'ce_mode_from_stat()' to 'read-cache.c'\n - read-cache: remove redundant extern declarations\n\n The 'trust_executable_bit' (coming from 'core.filemode'\n configuration) has been migrated into 'repo_config_values' to tie it\n to a specific repository instance.\n\n Needs review.\n source: <20260619162105.648495-1-cat@malon.dev>\n\n\n* kk/prio-queue-cascade-sift (2026-06-01) 1 commit\n - prio-queue: use cascade-down for faster extract-min\n\n prio_queue_get() has been optimized by using a cascade-down approach\n (promoting the smaller child at each level and sifting up the last\n element from the leaf vacancy), which halves the number of comparisons\n per extract-min operation in the common case.\n\n On hold, waiting for kk/prio-queue-get-put-fusion to land first.\n cf. \n source: \n\n\n* jk/repo-info-path-keys (2026-06-23) 3 commits\n - repo: add path.gitdir with absolute and relative suffix formatting\n - repo: add path.commondir with absolute and relative suffix formatting\n - path: extract format_path() and use in rev-parse\n\n The \"git repo info\" command has been taught new keys to output both\n absolute and relative paths for \"gitdir\" and \"commondir\", supported by\n a new path-formatting helper extracted from \"git rev-parse\".\n\n Will merge to 'next'?\n cf. \n source: <20260624033748.108281-1-jayatheerthkulkarni2005@gmail.com>\n\n\n* ps/history-drop (2026-06-15) 10 commits\n - builtin/history: implement \"drop\" subcommand\n - builtin/history: split handling of ref updates into two phases\n - reset: stop assuming that the caller passes in a clean index\n - reset: allow the caller to specify the current HEAD object\n - reset: introduce ability to skip updating HEAD\n - reset: introduce dry-run mode\n - reset: modernize flags passed to `reset_working_tree()`\n - reset: rename `reset_head()`\n - reset: drop `USE_THE_REPOSITORY_VARIABLE`\n - read-cache: split out function to drop unmerged entries to stage 0\n\n The experimental \"git history\" command has been taught a new \"drop\"\n subcommand to remove a commit and replay its descendants onto its\n parent.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260615-b4-pks-history-drop-v6-0-2e329e536d78@pks.im>\n\n\n* jk/setup-gitfile-diag-fix (2026-06-16) 1 commit\n (merged to 'next' on 2026-06-18 at b63b3d1f25)\n + read_gitfile(): simplify NOT_A_REPO error message\n\n A regression in the error diagnosis code for invalid .git files has\n been fixed, avoiding a potential NULL-pointer crash when reporting\n that a .git file does not point to a valid repository.\n\n Will cook in 'next'.\n cf. \n source: <20260616123516.GA2301231@coredump.intra.peff.net>\n\n\n* kh/doc-trailers (2026-06-10) 10 commits\n - doc: interpret-trailers: document comment line treatment\n - doc: interpret-trailers: commit to “trailer block” term\n - doc: interpret-trailers: join new-trailers again\n - doc: interpret-trailers: add key format example\n - doc: interpret-trailers: explain key format\n - doc: interpret-trailers: explain the format after the intro\n - doc: interpret-trailers: not just for commit messages\n - doc: interpret-trailers: use “metadata” in Name as well\n - doc: interpret-trailers: replace “lines” with “metadata”\n - doc: interpret-trailers: stop fixating on RFC 822\n\n Documentation updates.\n\n Expecting a reroll.\n cf. <729baf6b-53ea-4e8d-95ab-5935667e66c2@app.fastmail.com>\n source: \n\n\n* za/completion-hide-dotfiles (2026-06-20) 2 commits\n - completion: hide dotfiles by default for path completion\n - completion: hide dotfiles for selected path completion\n\n The path completion for commands like `git rm` and `git mv`, is being\n updated to hide dotfiles by default, unless the user explicitly starts\n the path with a dot, matching standard shell-completion behavior.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: \n\n\n* ec/commit-fixup-options (2026-05-26) 2 commits\n - commit: allow -c/-C for all kinds of --fixup\n - commit: allow -m/-F for all kinds of --fixup\n\n The -m/-F/-c/-C options to supply commit log message from outside the\n editor are now supported for all \"git commit --fixup\" variations.\n\n Needs review.\n source: \n\n\n* kh/doc-replay-config (2026-06-05) 4 commits\n - doc: replay: move “default” to the right-hand side\n - doc: replay: use a nested description list\n - doc: replay: improve config description\n - doc: link to config for git-replay(1)\n\n Doc update for \"git replay\" to actually refer to its configuration\n variables.\n\n Needs review.\n source: \n\n\n* hn/status-pull-advice-qualified (2026-05-21) 1 commit\n (merged to 'next' on 2026-06-15 at 898a4df940)\n + remote: qualify \"git pull\" advice for non-upstream compareBranches\n\n Advice shown by \"git status\" when the local branch is behind or has\n diverged from its push branch has been updated to suggest \"git pull\n \".\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* hn/branch-delete-merged (2026-06-24) 7 commits\n - branch: add --dry-run for --delete-merged\n - branch: add branch..deleteMerged opt-out\n - branch: add --delete-merged \n - branch: prepare delete_branches for a bulk caller\n - branch: let delete_branches skip unmerged branches on bulk refusal\n - branch: convert delete_branches() to a flags argument\n - branch: add --forked filter for --list mode\n\n \"git branch\" command learned \"--delete-merged\" option to remove\n local branches that have already been merged to the remote-tracking\n branches they track.\n\n Needs review.\n source: \n\n\n* cc/promisor-auto-config-url-more (2026-05-27) 8 commits\n (merged to 'next' on 2026-06-15 at d1c99e75cc)\n + doc: promisor: improve acceptFromServer entry\n + promisor-remote: auto-configure unknown remotes\n + promisor-remote: trust known remotes matching acceptFromServerUrl\n + promisor-remote: introduce promisor.acceptFromServerUrl\n + promisor-remote: add 'local_name' to 'struct promisor_info'\n + urlmatch: add url_normalize_pattern() helper\n + urlmatch: change 'allow_globs' arg to bool\n + t5710: simplify 'mkdir X' followed by 'git -C X init'\n\n The handling of promisor-remote protocol capability has been\n loosened to allow the other side to add to the list of promisor\n remotes via the promisor.acceptFromServerURL configuration\n variable.\n\n Will cook in 'next'.\n cf. <877bo7294j.fsf@emacs.iotcl.com>\n cf. \n source: <20260527140820.1438165-1-christian.couder@gmail.com>\n\n\n* hn/checkout-track-fetch (2026-06-24) 2 commits\n - checkout: extend --track with a \"fetch\" mode to refresh start-point\n - branch: expose helpers for finding the remote owning a tracking ref\n\n \"git checkout --track=...\" learned to optionally fetch the branch\n from the remote the new branch will work with.\n\n Waiting for response(s) to review comment(s).\n cf. <12998c3a-ff69-4a98-9ed6-18aa0224e75e@gmail.com>\n source: \n\n\n* en/ort-harden-against-corrupt-trees (2026-06-13) 5 commits\n (merged to 'next' on 2026-06-18 at e51bee59ca)\n + cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts\n + merge-ort: abort merge when trees have duplicate entries\n + merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()\n + merge-ort: drop unnecessary show_all_errors from collect_merge_info()\n + merge-ort: propagate callback errors from traverse_trees_wrapper()\n\n \"ort\" merge backend handles merging corrupt trees better by\n aborting when it should.\n\n Will cook in 'next'.\n cf. \n source: \n\n\n* pw/status-rebase-todo (2026-06-23) 2 commits\n (merged to 'next' on 2026-06-23 at a0fcde09dc)\n + status: improve rebase todo list parsing\n + sequencer: factor out parsing of todo commands\n\n The display of the rebase todo list in \"git status\" has been\n improved to correctly abbreviate object IDs for more commands and\n avoid misinterpreting refs as object IDs.\n\n Will cook in 'next'.\n source: \n\n\n* ps/shift-root-in-graph (2026-06-20) 3 commits\n - graph: indent visual root in graph\n - revision: add peek functions for lookahead\n - lib-log-graph: move check_graph function\n\n \"git log --graph\" has been modified to visually distinguish\n parentless \"root\" commits (and commits that become roots due to\n history simplification) by indenting them, preventing them from\n appearing falsely related to unrelated commits rendered immediately\n above them.\n\n Waiting for response(s) to review comment(s).\n The peek-ahead approach may need to be scratched.\n cf. \n cf. \n source: <20260620-ps-pre-commit-indent-v6-0-cdc6d8fd5fbc@gmail.com>\n"},{"id":"546739","messageId":"87cxx84exj.fsf@emacs.iotcl.com","threadId":"65872","inReplyTo":"xmqq5x36dtyf.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jun 2026, #10)","fromName":"Toon Claes","fromEmail":"toon@iotcl.com","sentAt":"2026-06-30T08:20:56Z","receivedAt":"2026-06-30T08:21:23Z","isPatch":false,"body":"Junio C Hamano writes:\n\n> * ps/odb-generalize-prepare (2026-06-22) 3 commits\n> - odb: introduce `odb_prepare()`\n> - odb/source: generalize `reprepare()` callback\n> - Merge branch 'ps/odb-source-packed' into ps/odb-generalize-prepare\n> (this branch uses ps/odb-source-packed.)\n>\n> The `reprepare()` callback for object database sources has been\n> generalized into a `prepare()` callback with an optional flush cache\n> flag, and a new `odb_prepare()` wrapper has been introduced to\n> allow pre-opening object database sources.\n>\n> Needs review.\n> source: <20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>\n\nI did have some questions/remarks, but Patrick answered them, and with\nthose answers I'm happy about this series.\n\n-- \nCheers,\nToon\n"},{"id":"546806","messageId":"xmqq4iijsuab.fsf@gitster.g","threadId":"65872","inReplyTo":"87cxx84exj.fsf@emacs.iotcl.com","subject":"Re: What's cooking in git.git (Jun 2026, #10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-06-30T19:27:40Z","receivedAt":"2026-06-30T19:27:43Z","isPatch":false,"body":"Toon Claes writes:\n\n> Junio C Hamano writes:\n>\n>> * ps/odb-generalize-prepare (2026-06-22) 3 commits\n>> - odb: introduce `odb_prepare()`\n>> - odb/source: generalize `reprepare()` callback\n>> - Merge branch 'ps/odb-source-packed' into ps/odb-generalize-prepare\n>> (this branch uses ps/odb-source-packed.)\n>>\n>> The `reprepare()` callback for object database sources has been\n>> generalized into a `prepare()` callback with an optional flush cache\n>> flag, and a new `odb_prepare()` wrapper has been introduced to\n>> allow pre-opening object database sources.\n>>\n>> Needs review.\n>> source: <20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>\n>\n> I did have some questions/remarks, but Patrick answered them, and with\n> those answers I'm happy about this series.\n\nYeah, I am also happy with these patches.\n\nThanks.\n"}]}