{"thread":{"id":"64561","subject":"What's cooking in git.git (Nov 2025, #10; Sun, 30)","startedAt":"2025-12-01T05:05:10Z","lastAt":"2025-12-08T08:44:43Z","messageCount":6,"participants":["Junio C Hamano","Patrick Steinhardt","Karthik Nayak","Jeff King","Adrian Ratiu"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"531483","messageId":"xmqq5xaqbxmk.fsf@gitster.g","threadId":"64561","inReplyTo":null,"subject":"What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-12-01T05:05:07Z","receivedAt":"2025-12-01T05:05:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"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 are 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 an URL\nto a message that raises issues but they are no means exhaustive.  A\ntopic without enough support may be discarded after a long period of\nno activity (of course they can be resubmit when new interests\narise).\n\nThe maintainer will only be online for a few days during the first\nweek of December, so please expect things to be slower in my tree.\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[Graduated to 'master']\n\n* ja/doc-synopsis-style (2025-11-24) 4 commits\n  (merged to 'next' on 2025-11-24 at 10610d9a57)\n + doc: pull-fetch-param typofix\n  (merged to 'next' on 2025-11-21 at eb9c1703c0)\n + doc: convert git push to synopsis style\n + doc: convert git pull to synopsis style\n + doc: convert git fetch to synopsis style\n\n Doc mark-up updates.\n \n source: <pull.2002.git.1763588404.gitgitgadget@gmail.com>\n\n\n* jc/whitespace-incomplete-line (2025-11-12) 12 commits\n  (merged to 'next' on 2025-11-24 at 9682c7f652)\n + attr: enable incomplete-line whitespace error for this project\n + diff: highlight and error out on incomplete lines\n + apply: check and fix incomplete lines\n + whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE\n + apply: revamp the parsing of incomplete lines\n + diff: update the way rewrite diff handles incomplete lines\n + diff: call emit_callback ecbdata everywhere\n + diff: refactor output of incomplete line\n + diff: keep track of the type of the last line seen\n + diff: correct suppress_blank_empty hack\n + diff: emit_line_ws_markup() if/else style fix\n + whitespace: correct bit assignment comments\n\n Both \"git apply\" and \"git diff\" learn a new whitespace error class,\n \"incomplete-line\".\n \n source: <20251112220258.1009253-1-gitster@pobox.com>\n\n\n* je/doc-data-model (2025-11-12) 1 commit\n  (merged to 'next' on 2025-11-24 at 50e59df383)\n + doc: add an explanation of Git's data model\n\n Add a new manual that describes the data model.\n \n source: <pull.1981.v7.git.1762977200244.gitgitgadget@gmail.com>\n\n\n* jk/asan-bonanza (2025-11-18) 9 commits\n  (merged to 'next' on 2025-11-24 at 066fc38a19)\n + t: enable ASan's strict_string_checks option\n + fsck: avoid parse_timestamp() on buffer that isn't NUL-terminated\n + fsck: remove redundant date timestamp check\n + fsck: avoid strcspn() in fsck_ident()\n + fsck: assert newline presence in fsck_ident()\n + cache-tree: avoid strtol() on non-string buffer\n + Makefile: turn on NO_MMAP when building with ASan\n + pack-bitmap: handle name-hash lookups in incremental bitmaps\n + compat/mmap: mark unused argument in git_munmap()\n\n Various issues detected by Asan have been corrected.\n \n source: <20251118091127.GA4175601@coredump.intra.peff.net>\n\n\n* lo/repo-info-all (2025-11-18) 2 commits\n  (merged to 'next' on 2025-11-21 at bb6bddcfc7)\n + repo: add --all to git-repo-info\n + repo: factor out field printing to dedicated function\n\n \"git repo info\" learned \"--all\" option.\n \n source: <20251118204929.43597-1-lucasseikioshiro@gmail.com>\n\n--------------------------------------------------\n[New Topics]\n\n* tc/last-modified-active-paths-optimization (2025-11-28) 1 commit\n - last-modified: fix use of uninitialized memory\n\n Recent optimization to \"last-modified\" command introduced use of\n uninitialized block of memory, which has been corrected.\n\n Will merge to 'next'.\n source: <20251128-toon-big-endian-ci-v1-1-80da0f629c1e@iotcl.com>\n\n\n* en/replay-doc-revision-range (2025-11-28) 1 commit\n  (merged to 'next' on 2025-11-30 at 37ba09bea2)\n + Documentation/git-replay.adoc: fix errors around revision range\n\n The use of \"revision\" (a connected set of commits) has been\n clarified in the \"git replay\" documentation.\n\n Will merge to 'master'.\n source: <pull.2012.git.1764391464952.gitgitgadget@gmail.com>\n\n\n* jk/parse-int (2025-11-30) 5 commits\n - fsck: use parse_unsigned_from_buf() for parsing timestamp\n - cache-tree: use parse_int_from_buf()\n - parse: add functions for parsing from non-string buffers\n - parse: prefer bool to int for boolean returns\n - Merge branch 'jk/asan-bonanza' into jk/parse-int\n\n Introduce a more robust way to parse a decimal integer stored in a\n piece of memory that is not necessarily terminated with NUL (which\n Asan strict-string-check complains even when use of strtol() is\n safe due to varified existence of whitespace after the digits).\n\n Will merge to 'next'?\n source: <20251130131351.GA198697@coredump.intra.peff.net>\n\n\n* js/test-symlink-windows (2025-11-29) 10 commits\n - t7800: work around the MSYS path conversion on Windows\n - t6423: introduce Windows-specific handling for symlinking to /dev/null\n - t1305: skip symlink tests that do not apply to Windows\n - t1006: accommodate for symlink support in MSYS2\n - t0600: fix incomplete prerequisite for a test case\n - t0301: another fix for Windows compatibility\n - t0001: handle `diff --no-index` gracefully\n - mingw: special-case `open(symlink, O_CREAT | O_EXCL)`\n - apply: symbolic links lack a \"trustable executable bit\"\n - t9700: accommodate for Windows paths\n\n Prepare test suite \n\n Comments?\n cf. <xmqqms44cb7p.fsf@gitster.g>\n cf. <xmqqecpgc8wd.fsf@gitster.g>\n source: <pull.2009.git.1764440906.gitgitgadget@gmail.com>\n\n\n* rs/diff-index-find-copies-harder-optim (2025-11-30) 1 commit\n - diff-index: don't queue unchanged filepairs with diff_change()\n\n Halve the memory consumed by artificial filepairs created during\n \"git diff --find-copioes-harder\", also making the operation run\n faster.\n\n Will merge to 'next'.\n source: <aa28974b-ec73-4562-bfc8-4745ad58b55a@web.de>\n\n--------------------------------------------------\n[Cooking]\n\n* pw/replay-exclude-gpgsig-fix (2025-11-26) 1 commit\n  (merged to 'next' on 2025-11-30 at 3dda1242db)\n + replay: do not copy \"gpgsign-sha256\" header\n\n \"git replay\" forgot to omit the \"gpgsig-sha256\" extended header\n from the resulting commit the same way it omits \"gpgsig\", which has\n been corrected.\n\n Will merge to 'master'.\n source: <4f04af5790353b074cf122c450c1cd3f8d1cecf3.1764167611.git.phillip.wood@dunelm.org.uk>\n\n\n* tc/last-modified-options-cleanup (2025-11-26) 4 commits\n - fixup! last-modified: document option --max-depth\n - last-modified: document how depth is handled better\n - last-modified: document option --max-depth\n - last-modified: handle and document NUL termination\n\n The \"-z\" and \"--max-depth\" documentation (and implementation of\n \"-z\") in the \"git last-modified\" command have been updated.\n\n Expecting a reroll.\n source: <20251126-toon-last-modified-zzzz-v1-0-608350df0caa@iotcl.com>\n\n\n* yc/xdiff-patience-optim (2025-11-26) 1 commit\n  (merged to 'next' on 2025-11-30 at db62d67599)\n + xdiff: optimize patience diff's LCS search\n\n The way patience diff finds LCS has been optimized.\n\n Will merge to 'master'.\n source: <pull.2109.v2.git.git.1764209766305.gitgitgadget@gmail.com>\n\n\n* bc/zsh-testsuite (2025-11-27) 2 commits\n  (merged to 'next' on 2025-11-30 at b4a3081f6f)\n + t5564: fix test hang under zsh's sh mode\n + t0614: use numerical comparison with test_line_count\n\n A few tests have been updated to work under the shell compatible\n mode of zsh.\n\n Will merge to 'master'.\n source: <20251128012107.101431-1-sandals@crustytoothpaste.net>\n\n\n* ds/doc-scalar-config (2025-11-26) 5 commits\n - scalar: document config settings\n - scalar: alphabetize and simplify config\n - scalar: remove stale config values\n - scalar: use index.skipHash=true for performance\n - scalar: annotate config file with \"set by scalar\"\n\n Documentation updates.\n\n Expecting a reroll.\n cf. <089c3225-82cb-4039-83df-f97ea9fd49b2@gmail.com>\n source: <pull.2010.git.1764195516.gitgitgadget@gmail.com>\n\n\n* pw/replay-drop-empty (2025-11-27) 2 commits\n - replay: drop commits that become empty\n - Merge branch 'ps/history' into pw/replay-drop-empty\n (this branch uses ps/history.)\n\n \"git replay\" is taught to drop commits that become empty (not the\n ones that are empty in the original).\n\n On hold, until the base topic stabilizes.\n source: <8a2a1215306452147cc7b803530ab2429bf57f15.1764260150.git.phillip.wood@dunelm.org.uk>\n\n\n* sp/shallow-time-boundary (2025-11-23) 1 commit\n - shallow: set borders which are all reachable after clone shallow since\n\n The set of shallow boundary \"git clone --shallow-since\" leaves\n contained commits that are not on the boundary, which has been\n corrected.\n\n Comments?\n source: <pull.2107.v2.git.git.1763926552033.gitgitgadget@gmail.com>\n\n\n* rs/config-set-multi-error-message-fix (2025-11-24) 1 commit\n  (merged to 'next' on 2025-11-26 at 639a1e26d2)\n + config: fix suggestion for failed set of multi-valued option\n\n The error message given by \"git config set\", when the variable\n being updated has more than one values defined, used old style \"git\n config\" syntax with an incorrect option in its hint, both of which\n have been corrected.\n\n Will merge to 'master'.\n source: <c09945fe-fee2-47f6-8193-ac60d7245209@web.de>\n\n\n* rs/config-unset-opthelp-fix (2025-11-24) 1 commit\n  (merged to 'next' on 2025-11-26 at 31e282f4ae)\n + config: fix short help of unset flags\n\n The option help text given by \"git config unset -h\" described\n the \"--all\" option to \"replace\", not \"unset\", multiple variables,\n which has been corrected.\n\n Will merge to 'master'.\n source: <06997dce-e4d5-4889-8e70-5f44da3dc800@web.de>\n\n\n* wm/complete-git-short-opts (2025-11-26) 1 commit\n - completion: complete \"git -<TAB>\" with short options\n\n The command line completion script (in contrib/) learned to\n complete \"git -<TAB>\" to give single-letter options like \"-C\".\n\n Will merge to 'next'?\n source: <pull.2100.v2.git.git.1764174391776.gitgitgadget@gmail.com>\n\n\n* jc/optional-path (2025-11-20) 3 commits\n  (merged to 'next' on 2025-11-25 at 5e75404281)\n + config: really treat missing optional path as not configured\n + config: really pretend missing :(optional) value is not there\n + config: mark otherwise unused function as file-scope static\n\n \"git config get --path\" segfaulted on an \":(optional)path\" that\n does not exist, which has been corrected.\n\n Will merge to 'master'.\n source: <xmqqikf47ajk.fsf@gitster.g>\n\n\n* kh/doc-committer-date-is-author-date (2025-11-20) 1 commit\n  (merged to 'next' on 2025-11-25 at 9f829587af)\n + doc: warn against --committer-date-is-author-date\n\n The \"--committer-date-is-author-date\" option of \"git am/rebase\" is\n a misguided one.  The documentation is updated to discourage its\n use.\n\n Will merge to 'master'.\n source: <V2_committer-date-is-author-date.1@msgid.xyz>\n\n\n* gf/win32-pthread-cond-init (2025-11-20) 1 commit\n - win32: pthread_cond_init should return a value\n\n Emulation code clean-up.\n\n Will merge to 'next'?\n source: <pull.2103.v3.git.git.1763675016637.gitgitgadget@gmail.com>\n\n\n* kn/ref-location (2025-11-26) 2 commits\n - refs: add GIT_REF_URI to specify reference backend and directory\n - refs: support obtaining ref_store for given dir\n\n A mechanism to specify what reference backend to use and store\n references in which directory is introduced, which would likely to\n be useful during ref migration.\n\n Comments?\n source: <20251126-kn-alternate-ref-dir-v2-0-8b9f6f18f635@gmail.com>\n\n\n* js/ci-show-breakage-in-dockerized-jobs (2025-11-17) 1 commit\n  (merged to 'next' on 2025-11-26 at 3c4a8c430f)\n + ci(dockerized): do show the result of failing tests again\n\n Dockerised jobs at the GitHub Actions CI have been taught to show\n more details of failed tests.\n\n Will merge to 'master'.\n cf. <xmqqpl9gike6.fsf@gitster.g>\n cf. <CABPp-BErdhTjbqDem4Xvc-XbhgLUEpy9-eiaaR1F_diMca--6A@mail.gmail.com>\n source: <pull.2003.git.1763399064983.gitgitgadget@gmail.com>\n\n\n* js/strip-scalar-too (2025-11-17) 1 commit\n  (merged to 'next' on 2025-11-25 at 9f2607acfb)\n + make strip: include `scalar`\n\n \"make strip\" has been taught to strip \"scalar\" as well as \"git\".\n\n Will merge to 'master'.\n cf. <xmqq7bvoiadg.fsf@gitster.g>\n source: <pull.2004.git.1763409086322.gitgitgadget@gmail.com>\n\n\n* dw/config-global-list (2025-10-09) 4 commits\n - config: keep bailing on unreadable global files\n - config: read global scope via config_sequence\n - config: test home and xdg files in `list --global`\n - cleanup_path: force forward slashes on Windows\n\n \"git config --list --global\", unlike \"git config --list\", did not\n consult both of the two possible per-user sources of the\n configuration files, i.e. $HOME/.gitconfig and the XDG one, which\n has been corrected.\n\n Expecting a reroll.\n cf. <20251122020047.GB3947@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net>\n source: <pull.1938.git.1760058849.gitgitgadget@gmail.com>\n\n\n* ps/object-read-stream (2025-11-23) 20 commits\n - streaming: drop redundant type and size pointers\n - streaming: move into object database subsystem\n - streaming: refactor interface to be object-database-centric\n - streaming: move logic to read packed objects streams into backend\n - streaming: move logic to read loose objects streams into backend\n - streaming: make the `odb_read_stream` definition public\n - streaming: get rid of `the_repository`\n - streaming: rely on object sources to create object stream\n - packfile: introduce function to read object info from a store\n - streaming: move zlib stream into backends\n - streaming: create structure for filtered object streams\n - streaming: create structure for packed object streams\n - streaming: create structure for loose object streams\n - streaming: create structure for in-core object streams\n - streaming: allocate stream inside the backend-specific logic\n - streaming: explicitly pass packfile info when streaming a packed object\n - streaming: propagate final object type via the stream\n - streaming: drop the `open()` callback function\n - streaming: rename `git_istream` into `odb_read_stream`\n - Merge branch 'ps/object-source-loose' into ps/object-read-stream\n\n The \"git_istream\" abstraction has been revamped to make it easier\n to interface with pluggable object database design.\n\n Will merge to 'next'?\n source: <20251123-b4-pks-odb-read-stream-v3-0-1a129182822b@pks.im>\n\n\n* ps/object-source-management (2025-11-18) 14 commits\n  (merged to 'next' on 2025-11-26 at 6f98745b4a)\n + odb: handle recreation of quarantine directories\n + odb: handle changing a repository's commondir\n + chdir-notify: add function to unregister listeners\n + odb: handle initialization of sources in `odb_new()`\n + http-push: stop setting up `the_repository` for each reference\n + t/helper: stop setting up `the_repository` repeatedly\n + builtin/index-pack: fix deferred fsck outside repos\n + oidset: introduce `oidset_equal()`\n + odb: move logic to disable ref updates into repo\n + odb: refactor `odb_clear()` to `odb_free()`\n + odb: adopt logic to close object databases\n + setup: convert `set_git_dir()` to have file scope\n + path: move `enter_repo()` into \"setup.c\"\n + Merge branch 'ps/object-source-loose' into ps/object-source-management\n\n Code refactoring around object database sources.\n\n Will merge to 'master'.\n cf. <aSAZSyUzIMvn-IvR@pks.im>\n source: <20251119-b4-pks-odb-creation-v1-0-2b2ed2612cb6@pks.im>\n\n\n* jc/submodule-add (2025-11-15) 1 commit\n - submodule add: sanity check existing .gitmodules\n\n \"git submodule add\" to add a submodule under <name> segfaulted,\n when a submodule.<name>.something is already in .gitmodules file\n without defining where its submodule.<name>.path is, which has been\n corrected.\n\n Comments?\n source: <xmqqv7jacvdq.fsf@gitster.g>\n\n\n* kn/fix-fetch-backfill-tag-with-batched-ref-updates (2025-11-21) 3 commits\n - fetch: fix failed batched updates skipping operations\n - fetch: fix non-conflicting tags not being committed\n - fetch: extract out reference committing logic\n\n \"git fetch\" that involves fetching tags, when a tag being fetched\n needs to overwrite existing one, failed to fetch other tags, which\n has been corrected.\n\n Will merge to 'next'?\n source: <20251121-fix-tags-not-fetching-v8-0-23b53a8a8334@gmail.com>\n\n\n* lc/rebase-trailer (2025-11-05) 4 commits\n - rebase: support --trailer\n - trailer: append trailers in-process and drop the fork to `interpret-trailers`\n - trailer: move process_trailers to trailer.h\n - interpret-trailers: factor out buffer-based processing to process_trailers()\n\n Refactor code paths to run \"interpret-trailers\" from \"git\n commit/tag\" and use it in \"git rebase\".\n\n Expecting a reroll.\n cf. <19a8fe42354.3909481a3912041.7970296104893780556@linux.beauty>\n source: <20251105142944.73061-1-me@linux.beauty>\n\n\n* jc/exclude-with-gitignore (2025-11-04) 1 commit\n - dir.c: do not be fooled by :(exclude) pathspec elements\n\n \"git add ':(exclude)foo.o'\" is clearly a request not to add 'foo.o',\n but the command complained about listing an ignored path foo.o on\n the command line, which has been corrected.\n\n Comments?\n source: <xmqqtsz9o3cn.fsf@gitster.g>\n\n\n* cc/fast-import-strip-if-invalid (2025-11-16) 3 commits\n  (merged to 'next' on 2025-11-26 at 7235cd0d18)\n + fast-import: add 'strip-if-invalid' mode to --signed-commits=<mode>\n + commit: refactor verify_commit_buffer()\n + fast-import: refactor finalize_commit_buffer()\n\n \"git fast-import\" learns \"--strip-if-invalid\" option to drop\n invalid cryptographic signature from objects.\n\n Will merge to 'master'.\n source: <20251117043450.322644-1-christian.couder@gmail.com>\n\n\n* bc/sha1-256-interop-02 (2025-11-17) 15 commits\n - object-file-convert: always make sure object ID algo is valid\n - rust: add a small wrapper around the hashfile code\n - rust: add a new binary object map format\n - rust: add functionality to hash an object\n - rust: add a build.rs script for tests\n - hash: expose hash context functions to Rust\n - write-or-die: add an fsync component for the object map\n - csum-file: define hashwrite's count as a uint32_t\n - rust: add additional helpers for ObjectID\n - hash: add a function to look up hash algo structs\n - rust: add a hash algorithm abstraction\n - rust: add a ObjectID struct\n - hash: use uint32_t for object_id algorithm\n - conversion: don't crash when no destination algo\n - repository: require Rust support for interoperability\n\n The code to maintain mapping between object names in multiple hash\n functions is being added, written in Rust.\n source: <20251117221621.2863243-1-sandals@crustytoothpaste.net>\n\n\n* en/xdiff-cleanup-2 (2025-11-18) 10 commits\n  (merged to 'next' on 2025-11-25 at 452b7107da)\n + xdiff: rename rindex -> reference_index\n + xdiff: change rindex from long to size_t in xdfile_t\n + xdiff: make xdfile_t.nreff a size_t instead of long\n + xdiff: make xdfile_t.nrec a size_t instead of long\n + xdiff: split xrecord_t.ha into line_hash and minimal_perfect_hash\n + xdiff: use unambiguous types in xdl_hash_record()\n + xdiff: use size_t for xrecord_t.size\n + xdiff: make xrecord_t.ptr a uint8_t instead of char\n + xdiff: use ptrdiff_t for dstart/dend\n + doc: define unambiguous type mappings across C and Rust\n\n Code clean-up.\n\n Will merge to 'master'.\n source: <pull.2070.v5.git.git.1763505262.gitgitgadget@gmail.com>\n\n\n* ar/run-command-hook (2025-11-24) 10 commits\n - receive-pack: convert receive hooks to hook API\n - receive-pack: convert update hooks to new API\n - hooks: allow callers to capture output\n - run-command: allow capturing of collated output\n - hook: allow overriding the ungroup option\n - reference-transaction: use hook API instead of run-command\n - transport: convert pre-push to hook API\n - hook: convert 'post-rewrite' hook in sequencer.c to hook API\n - hook: provide stdin via callback\n - run-command: add stdin callback for parallelization\n\n Use hook API to replace ad-hoc invocation of hook scripts with the\n run_command() API.\n\n Will merge to 'next'?\n source: <20251124172043.1650014-1-adrian.ratiu@collabora.com>\n\n\n* je/doc-reset (2025-10-17) 4 commits\n - doc: git-reset: clarify `git reset <pathspec>`\n - doc: git-reset: clarify `git reset [mode]`\n - doc: git-reset: clarify intro\n - doc: git-reset: reorder the forms\n\n Documentation updates.\n\n Expecting a reroll.\n cf. <8099e7ef-2673-407e-8cca-e6b566b99549@app.fastmail.com>\n source: <pull.1991.git.1760731558.gitgitgadget@gmail.com>\n\n\n* ps/history (2025-10-27) 12 commits\n - builtin/history: implement \"split\" subcommand\n - cache-tree: allow writing in-memory index as tree\n - add-patch: add support for in-memory index patching\n - add-patch: remove dependency on \"add-interactive\" subsystem\n - add-patch: split out `struct interactive_options`\n - add-patch: split out header from \"add-interactive.h\"\n - builtin/history: implement \"reword\" subcommand\n - builtin: add new \"history\" command\n - replay: stop using `the_repository`\n - replay: extract logic to pick commits\n - wt-status: provide function to expose status for trees\n - Merge branch 'sa/replay-atomic-ref-updates' into ps/history\n (this branch is used by pw/replay-drop-empty.)\n\n \"git history\" history rewriting UI.\n\n Expecting a reroll.\n cf. <aRxDYkeAi8T-HH8M@pks.im>\n source: <20251027-b4-pks-history-builtin-v6-0-407dd3f57ad3@pks.im>\n\n\n* ms/doc-worktree-side-by-side (2025-10-10) 2 commits\n - doc: git-worktree: Add side by side branch checkout example\n - doc: git-worktree: Link to examples\n\n Document \"git worktree add\" and use of out-of-tree worktrees with\n examples.\n\n Expecting a reroll.\n cf. <CAPig+cSNesf0UwS4=Bxe-Qn+G9y3YYPyOK+7y3q8QJk+o7jaVg@mail.gmail.com>\n source: <a203b35538847f3c9358a5ae26fb4ebea5734cfc.1759420102.git.msuchanek@suse.de>\n\n\n* ar/submodule-gitdir-tweak (2025-11-19) 7 commits\n - meson/Makefile: allow setting submodule encoding at build time\n - submodule: use hashed name for gitdir\n - submodule: fix case-folding gitdir filesystem colisions\n - submodule: add extension to encode gitdir paths\n - submodule: always validate gitdirs inside submodule_name_to_gitdir\n - builtin/credential-store: move is_rfc3986_unreserved to url.[ch]\n - submodule--helper: use submodule_name_to_gitdir in add_submodule\n\n Avoid local submodule repository directory paths overlapping with\n each other by encoding submodule names before using them as path\n components.\n\n Will merge to 'next'?\n source: <20251119211030.2008441-1-adrian.ratiu@collabora.com>\n"},{"id":"531494","messageId":"aS1l0YuU9xOE7eog@pks.im","threadId":"64561","inReplyTo":"xmqq5xaqbxmk.fsf@gitster.g","subject":"Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Patrick Steinhardt","fromEmail":"ps@pks.im","sentAt":"2025-12-01T09:54:25Z","receivedAt":"2025-12-01T09:54:31Z","isPatch":false,"sender":{"key":"ps@pks.im","avatar":"https://avatars.githubusercontent.com/u/4056630?v=4"},"body":"On Sun, Nov 30, 2025 at 09:05:07PM -0800, Junio C Hamano wrote:\n> * ps/object-read-stream (2025-11-23) 20 commits\n>  - streaming: drop redundant type and size pointers\n>  - streaming: move into object database subsystem\n>  - streaming: refactor interface to be object-database-centric\n>  - streaming: move logic to read packed objects streams into backend\n>  - streaming: move logic to read loose objects streams into backend\n>  - streaming: make the `odb_read_stream` definition public\n>  - streaming: get rid of `the_repository`\n>  - streaming: rely on object sources to create object stream\n>  - packfile: introduce function to read object info from a store\n>  - streaming: move zlib stream into backends\n>  - streaming: create structure for filtered object streams\n>  - streaming: create structure for packed object streams\n>  - streaming: create structure for loose object streams\n>  - streaming: create structure for in-core object streams\n>  - streaming: allocate stream inside the backend-specific logic\n>  - streaming: explicitly pass packfile info when streaming a packed object\n>  - streaming: propagate final object type via the stream\n>  - streaming: drop the `open()` callback function\n>  - streaming: rename `git_istream` into `odb_read_stream`\n>  - Merge branch 'ps/object-source-loose' into ps/object-read-stream\n> \n>  The \"git_istream\" abstraction has been revamped to make it easier\n>  to interface with pluggable object database design.\n> \n>  Will merge to 'next'?\n>  source: <20251123-b4-pks-odb-read-stream-v3-0-1a129182822b@pks.im>\n\nI think this topic should be ready for next. The latest version didn't\nreceive any feedback, but all it did is to improve some commit messages\nand rename a function based on previous reviews.\n\n> * ps/history (2025-10-27) 12 commits\n>  - builtin/history: implement \"split\" subcommand\n>  - cache-tree: allow writing in-memory index as tree\n>  - add-patch: add support for in-memory index patching\n>  - add-patch: remove dependency on \"add-interactive\" subsystem\n>  - add-patch: split out `struct interactive_options`\n>  - add-patch: split out header from \"add-interactive.h\"\n>  - builtin/history: implement \"reword\" subcommand\n>  - builtin: add new \"history\" command\n>  - replay: stop using `the_repository`\n>  - replay: extract logic to pick commits\n>  - wt-status: provide function to expose status for trees\n>  - Merge branch 'sa/replay-atomic-ref-updates' into ps/history\n>  (this branch is used by pw/replay-drop-empty.)\n> \n>  \"git history\" history rewriting UI.\n> \n>  Expecting a reroll.\n>  cf. <aRxDYkeAi8T-HH8M@pks.im>\n>  source: <20251027-b4-pks-history-builtin-v6-0-407dd3f57ad3@pks.im>\n\nI'll address feedback on this topic later this week.\n\nThanks!\n\nPatrick\n"},{"id":"531498","messageId":"CAOLa=ZTC3gWcFVENTCa2WQsxaq4X2a_D+0qQUBdg31uf0zjoTg@mail.gmail.com","threadId":"64561","inReplyTo":"xmqq5xaqbxmk.fsf@gitster.g","subject":"Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2025-12-01T10:53:42Z","receivedAt":"2025-12-01T10:53:44Z","isPatch":false,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> * kn/ref-location (2025-11-26) 2 commits\n>  - refs: add GIT_REF_URI to specify reference backend and directory\n>  - refs: support obtaining ref_store for given dir\n>\n>  A mechanism to specify what reference backend to use and store\n>  references in which directory is introduced, which would likely to\n>  be useful during ref migration.\n>\n>  Comments?\n>  source: <20251126-kn-alternate-ref-dir-v2-0-8b9f6f18f635@gmail.com>\n>\n\nI'll send in a new version for this today.\n\n> * kn/fix-fetch-backfill-tag-with-batched-ref-updates (2025-11-21) 3 commits\n>  - fetch: fix failed batched updates skipping operations\n>  - fetch: fix non-conflicting tags not being committed\n>  - fetch: extract out reference committing logic\n>\n>  \"git fetch\" that involves fetching tags, when a tag being fetched\n>  needs to overwrite existing one, failed to fetch other tags, which\n>  has been corrected.\n>\n>  Will merge to 'next'?\n>  source: <20251121-fix-tags-not-fetching-v8-0-23b53a8a8334@gmail.com>\n>\n>\n\nThis should be ready for merge, it has been reviewed over multiple\nversions.\n\nThanks!\n"},{"id":"531502","messageId":"20251201114336.GA1559453@coredump.intra.peff.net","threadId":"64561","inReplyTo":"xmqq5xaqbxmk.fsf@gitster.g","subject":"Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2025-12-01T11:43:36Z","receivedAt":"2025-12-01T11:43:40Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Nov 30, 2025 at 09:05:07PM -0800, Junio C Hamano wrote:\n\n> * ar/submodule-gitdir-tweak (2025-11-19) 7 commits\n>  - meson/Makefile: allow setting submodule encoding at build time\n>  - submodule: use hashed name for gitdir\n>  - submodule: fix case-folding gitdir filesystem colisions\n>  - submodule: add extension to encode gitdir paths\n>  - submodule: always validate gitdirs inside submodule_name_to_gitdir\n>  - builtin/credential-store: move is_rfc3986_unreserved to url.[ch]\n>  - submodule--helper: use submodule_name_to_gitdir in add_submodule\n> \n>  Avoid local submodule repository directory paths overlapping with\n>  each other by encoding submodule names before using them as path\n>  components.\n> \n>  Will merge to 'next'?\n>  source: <20251119211030.2008441-1-adrian.ratiu@collabora.com>\n\nThis topic seems to introduce a race in t7450. Running:\n\n  make && (cd t && ./t7450-bad-git-dotfiles.sh --stress-limit=50)\n\nusually fails within 10 or so iterations, whereas without this topic I\ncan reliably get through 50 iterations (since it's racy, nothing is for\nsure, but it seems to trigger pretty easily).\n\nThe failing test is the parallel one added by 9cf8547320 (clone: prevent\nclashing git dirs when cloning submodule in parallel, 2024-01-28), which\nis making sure we catch nested modules during a parallel checkout. The\nrace seems to be in Git itself, and not an artifact of the test (so this\nisn't a race we want to wave away, but probably a real bug, perhaps even\none with security implications, according to that commit).\n\nBisection points to 099fe37397 (submodule: always validate gitdirs\ninside submodule_name_to_gitdir, 2025-11-19). Which seems plausible,\ngiven that it tries to move those same checks from 9cf8547320 around.\n\nIt's also possible that the race was always there and this simply makes\nit worse, but I wasn't ever able to trigger it on a pre-099fe37397\ncommit.\n\n-Peff\n"},{"id":"531787","messageId":"xmqqcy4rnmth.fsf@gitster.g","threadId":"64561","inReplyTo":"CAOLa=ZTC3gWcFVENTCa2WQsxaq4X2a_D+0qQUBdg31uf0zjoTg@mail.gmail.com","subject":"Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2025-12-07T00:43:38Z","receivedAt":"2025-12-07T00:43:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Karthik Nayak <karthik.188@gmail.com> writes:\n\n>> * kn/fix-fetch-backfill-tag-with-batched-ref-updates (2025-11-21) 3 commits\n>>  - fetch: fix failed batched updates skipping operations\n>>  - fetch: fix non-conflicting tags not being committed\n>>  - fetch: extract out reference committing logic\n>>\n>>  \"git fetch\" that involves fetching tags, when a tag being fetched\n>>  needs to overwrite existing one, failed to fetch other tags, which\n>>  has been corrected.\n>>\n>>  Will merge to 'next'?\n>>  source: <20251121-fix-tags-not-fetching-v8-0-23b53a8a8334@gmail.com>\n>>\n>>\n>\n> This should be ready for merge, it has been reviewed over multiple\n> versions.\n\nOther than the \"eventhough\" typo mentioned in\n\nhttps://lore.kernel.org/git/CAOLa=ZQ-O7V9qHbgeuQ78R1bHGDmGEM6fP5Kr9aC0AfvSF8MZA@mail.gmail.com/\n\nthis topic should be ready, I tend to agree.\n\n"},{"id":"531822","messageId":"87wm2xuzv9.fsf@gentoo.mail-host-address-is-not-set","threadId":"64561","inReplyTo":"20251201114336.GA1559453@coredump.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2025, #10; Sun, 30)","fromName":"Adrian Ratiu","fromEmail":"adrian.ratiu@collabora.com","sentAt":"2025-12-08T08:44:26Z","receivedAt":"2025-12-08T08:44:43Z","isPatch":false,"sender":{"key":"adrian.ratiu@collabora.com","avatar":"https://avatars.githubusercontent.com/u/12472556?v=4"},"body":"On Mon, 01 Dec 2025, Jeff King <peff@peff.net> wrote:\n> On Sun, Nov 30, 2025 at 09:05:07PM -0800, Junio C Hamano wrote:\n>\n>> * ar/submodule-gitdir-tweak (2025-11-19) 7 commits\n>>  - meson/Makefile: allow setting submodule encoding at build time\n>>  - submodule: use hashed name for gitdir\n>>  - submodule: fix case-folding gitdir filesystem colisions\n>>  - submodule: add extension to encode gitdir paths\n>>  - submodule: always validate gitdirs inside submodule_name_to_gitdir\n>>  - builtin/credential-store: move is_rfc3986_unreserved to url.[ch]\n>>  - submodule--helper: use submodule_name_to_gitdir in add_submodule\n>> \n>>  Avoid local submodule repository directory paths overlapping with\n>>  each other by encoding submodule names before using them as path\n>>  components.\n>> \n>>  Will merge to 'next'?\n>>  source: <20251119211030.2008441-1-adrian.ratiu@collabora.com>\n>\n> This topic seems to introduce a race in t7450. Running:\n>\n>   make && (cd t && ./t7450-bad-git-dotfiles.sh --stress-limit=50)\n>\n> usually fails within 10 or so iterations, whereas without this topic I\n> can reliably get through 50 iterations (since it's racy, nothing is for\n> sure, but it seems to trigger pretty easily).\n>\n> The failing test is the parallel one added by 9cf8547320 (clone: prevent\n> clashing git dirs when cloning submodule in parallel, 2024-01-28), which\n> is making sure we catch nested modules during a parallel checkout. The\n> race seems to be in Git itself, and not an artifact of the test (so this\n> isn't a race we want to wave away, but probably a real bug, perhaps even\n> one with security implications, according to that commit).\n>\n> Bisection points to 099fe37397 (submodule: always validate gitdirs\n> inside submodule_name_to_gitdir, 2025-11-19). Which seems plausible,\n> given that it tries to move those same checks from 9cf8547320 around.\n>\n> It's also possible that the race was always there and this simply makes\n> it worse, but I wasn't ever able to trigger it on a pre-099fe37397\n> commit.\n\nHi and sorry for the delayed response.\n\nAfter a conversation I had with Patrick on the patch series, I think I\nunderstand what caused this: we need to keep one of the validation\nchecks outside submodule_name_to_gitdir(), to prevent the race.\n\nWill fix in v6.\n"}]}