{"thread":{"id":"65943","subject":"What's cooking in git.git (Jul 2026, #03)","startedAt":"2026-07-07T17:19:01Z","lastAt":"2026-07-08T18:04:00Z","messageCount":4,"participants":["Junio C Hamano","Kristofer Karlsson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"547371","messageId":"xmqqeche67lr.fsf@gitster.g","threadId":"65943","inReplyTo":null,"subject":"What's cooking in git.git (Jul 2026, #03)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-07-07T17:18:56Z","receivedAt":"2026-07-07T17:19:01Z","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. They 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, it can be resubmitted when new interest\narises).\n\nThe first batch of topics have now graduated to the 'master' branch.\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* 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 updated\n to allow the other side to add to the list of promisor remotes via the\n 'promisor.acceptFromServerURL' configuration variable.\n\n Graduated to 'master'.\n cf. <877bo7294j.fsf@emacs.iotcl.com>\n cf. \n source: <20260527140820.1438165-1-christian.couder@gmail.com>\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 The 'ort' merge backend has been hardened against corrupt trees by\n ensuring it aborts under appropriate error conditions.\n\n Graduated to 'master'.\n cf. \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 Graduated to 'master'.\n cf. \n source: \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 Graduated to 'master'.\n cf. \n source: \n\n\n* jk/repo-info-path-keys (2026-06-23) 3 commits\n (merged to 'next' on 2026-06-29 at fbf9652169)\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 (this branch is used by ps/setup-split-discovery-and-setup.)\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 Graduated to 'master'.\n cf. \n source: <20260624033748.108281-1-jayatheerthkulkarni2005@gmail.com>\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 Graduated to 'master'.\n cf. \n source: <20260616123516.GA2301231@coredump.intra.peff.net>\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 Graduated to 'master'.\n cf. \n source: \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 Graduated to 'master'.\n cf. \n source: <20260619094751.2996804-1-m@lfurio.us>\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 better handle non-linear\n history, in which the path being tracked gets renamed differently in\n multiple history lines.\n\n Graduated to 'master'.\n source: \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 Graduated to 'master'.\n cf. \n source: \n\n\n* ps/connected-generic-promisor-checks (2026-06-25) 5 commits\n (merged to 'next' on 2026-06-29 at 10eef65b98)\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 Graduated to 'master'.\n cf. \n source: <20260625-pks-connected-generic-promisor-checks-v3-0-7308f3b9dc44@pks.im>\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 Graduated to 'master'.\n cf. <87eci7yomp.fsf@emacs.iotcl.com>\n source: <20260615-pks-b4-v4-0-22cfca8f19c5@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 Graduated to 'master'.\n cf. \n source: <20260617-pks-odb-source-packed-v3-0-b5c7583cd795@pks.im>\n\n\n* ps/refs-onbranch-fixes (2026-06-25) 12 commits\n (merged to 'next' on 2026-06-29 at 7b4929e311)\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-onbranch-fixes\n (this branch is used by ps/setup-split-discovery-and-setup.)\n\n Reference backend configuration has been updated to load lazily to\n avoid recursive calls during repository initialization when 'onbranch'\n configuration conditions are evaluated. This has also fixed a memory\n leak and allowed the unused 'chdir_notify_reparent()' machinery to be\n dropped.\n\n Graduated to 'master'.\n cf. \n source: <20260625-b4-pks-refs-avoid-chdir-notify-reparent-v6-0-41fbca3cf5e3@pks.im>\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 (this branch is used by ps/setup-split-discovery-and-setup.)\n\n The refactoring of 'setup.c' has been continued to drop remaining\n global state ('git_work_tree_cfg', 'is_bare_repository_cfg'), updating\n 'is_bare_repository()' to no longer implicitly rely on\n 'the_repository'.\n\n Graduated to 'master'.\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* 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 improved\n to correctly abbreviate object IDs for more commands and avoid\n misinterpreting refs as object IDs.\n\n Graduated to 'master'.\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 The default format path of 'git cat-file --batch' has been optimized\n to use 'strbuf_add_oid_hex()' and 'strbuf_add_uint()' instead of\n 'strbuf_addf()', yielding a noticeable speedup.\n\n Graduated to 'master'.\n cf. <20260615165326.GA91269@coredump.intra.peff.net>\n source: <5a7ed929-6fe0-496c-83bd-65dee57c2241@web.de>\n\n\n* sg/t3420-do-not-grep-in-missing-file (2021-10-10) 1 commit\n (merged to 'next' on 2026-06-29 at 2bf33c6a40)\n + t3420-rebase-autostash: don't try to grep non-existing files\n\n A test checking interactions between 'git rebase --quit' and autostash\n in 't3420-rebase-autostash.sh' has been corrected to use\n 'test_path_is_missing' instead of '! grep' on a file that shouldn't\n exist in the conflicted state.\n\n Graduated to 'master'.\n source: <20211010172809.1472914-1-szeder.dev@gmail.com>\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 'git pack-objects' command has been updated to support\n reachability bitmaps and delta-islands concurrently with the '--path-\n walk' option, allowing faster packaging by falling back to path-walk\n when bitmaps cannot fully satisfy the request.\n\n Graduated to 'master'.\n cf. \n source: \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 Graduated to 'master'.\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'\n have been migrated into 'struct repo_config_values' to tie them to\n per-repository configuration state.\n\n Graduated to 'master'.\n cf. \n cf. \n source: <20260610124353.149874-2-cat@malon.dev>\n source: <20260620140957.667820-1-cat@malon.dev>\n\n\n* wy/doc-clarify-review-replies (2026-06-21) 2 commits\n (merged to 'next' on 2026-06-29 at 21ae0599dc)\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 Graduated to 'master'.\n cf. \n source: \n\n--------------------------------------------------\n[New Topics]\n\n* ds/sparse-index-ita-crash (2026-07-06) 1 commit\n - sparse-index: avoid crash on intent-to-add entry outside the cone\n\n A crash in the sparse-index collapse code when encountering an\n invalidated cache-tree node (due to an intent-to-add path) has been\n fixed by avoiding collapsing such subtrees.\n\n Needs review.\n source: \n\n\n* ij/subtree-reject-v2-config (2026-07-06) 2 commits\n - git-subtree: Bail out if we find output from Rust rewrite (test)\n - git-subtree: Bail out if we find output from Rust rewrite\n\n The shell script implementation of 'git subtree' has been updated to\n check for the presence of the configuration file of the new Rust\n implementation, preventing users from accidentally running the old\n script on repositories already managed by the new tool.\n\n Expecting a reroll.\n cf. <27211.50096.133710.528147@chiark.greenend.org.uk>\n source: <20260706115816.20267-1-ijackson@chiark.greenend.org.uk>\n\n\n* kk/reftable-tombstone-quadratic-fix (2026-07-06) 2 commits\n - reftable: fix quadratic behavior when re-creating deleted refs\n - t: add tests for ref tombstone scenarios\n\n The performance of ref updates and reads using the reftable backend in\n the presence of many deletion tombstone records has been optimized by\n removing the tombstone suppression flag from the merged iterator and\n instead skipping tombstones at higher-level call sites where iteration\n bounds are known.\n\n Needs review.\n source: \n\n\n* rs/blame-abbrev-marks (2026-07-06) 1 commit\n - blame: reserve mark column only if necessary\n\n The alignment of commit object name abbreviations in 'git blame'\n output has been optimized to reserve a column for marks (caret,\n question mark, or asterisk) only when such marks are actually shown.\n\n Will merge to 'next'?\n cf. \n source: <92991b5e-0667-4315-89d5-1514a5499297@web.de>\n\n\n* jm/t0213-skip-emulated-ancestry-tests (2026-07-06) 1 commit\n - t0213: skip ancestry tests under user-mode emulation\n\n The 'TRACE2_ANCESTRY' prerequisite in the 't0213' test script has been\n refined to avoid failures under user-mode emulation. It now verifies\n that the ancestry collector reports the expected process names rather\n than the emulator binary name.\n\n Needs review.\n source: \n\n--------------------------------------------------\n[Stalled]\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\n the redirect target were lost because 'credential_from_url()' cleared\n the credential state. This has been fixed by preserving the collected\n headers across the redirect update.\n\n Waiting for response(s) to review comment(s) for too long, stalled.\n cf. <5144a29d-a53f-4446-beff-e1f549345bf9@nvidia.com>\n source: <20260602161150.1527493-1-aplattner@nvidia.com>\n\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 has been updated to retry for a short\n period, avoiding failures when multiple processes attempt to update\n the configuration 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[Cooking]\n\n* bc/parse-options-exit-0-on-help (2026-07-01) 4 commits\n - parse-options: exit 0 on -h\n - rev-parse: have --parseopt callers exit 0 on --help\n - parse-options: add a separate case for help output on error\n - t1517: skip svn tests if svn is not installed\n\n Option parsing with 'git rev-parse --parseopt' and most git\n subcommands has been updated to exit with 0 (instead of 129) when the\n help option ('-h' or '--help') is requested directly by the user,\n aligning with standard Unix convention.\n\n Expecting a reroll.\n cf. \n source: <20260701212442.1430084-1-sandals@crustytoothpaste.net>\n\n\n* mg/meson-hook-list-buildfix (2026-07-01) 1 commit\n - meson: restore hook-list.h to builtin_sources\n\n A racy build failure under Meson has been corrected by ensuring that\n the generated header file hook-list.h is built before compiling files\n in builtin_sources that depend on it.\n\n Will merge to 'next'.\n cf. \n source: <20260701193928.358825-1-floppym@gentoo.org>\n\n\n* zy/apply-abandoned-header-fix (2026-07-01) 1 commit\n - apply: avoid leaking abandoned git-header state\n\n A candidate git diff header parsed by 'git apply' has been isolated in\n a temporary structure, preventing any partially parsed state from\n polluting the main patch structure and causing assertions to trip if\n the header is ultimately rejected.\n\n Needs review.\n source: <20260702041759.51572-1-zhihao.yao@njit.edu>\n\n\n* jk/hash-algo-leak-fixes (2026-07-02) 9 commits\n - hash: add platform-specific discard functions\n - hash: fix memory leak copying sha256 gcrypt handles\n - http: discard hash in dumb-http http_object_request\n - check_stream_oid(): discard hash on read error\n - patch-id: discard hash when done\n - csum-file: provide a function to release checkpoints\n - csum-file: always finalize or discard hash\n - hash: add discard primitive\n - csum-file: drop discard_hashfile()\n\n Various code paths that initialize a cryptographic hash context but\n bail out or finish without calling 'git_hash_final()' have been taught\n to call 'git_hash_discard()' to release allocated resources, fixing\n memory leaks when Git is built with non-default backends like\n 'OpenSSL' or 'libgcrypt'.\n\n Will merge to 'next'?\n cf. \n source: <20260702075234.GA1548258@coredump.intra.peff.net>\n\n\n* ml/t9811-replace-test-f (2026-07-02) 1 commit\n - t9811: replace 'test -f' and '! test -f' with 'test_path_*'\n\n The test script 't/t9811-git-p4-label-import.sh' has been\n modernized to use 'test_path_is_file' and 'test_path_is_missing'\n instead of raw 'test -f' and '! test -f' calls.\n\n Expecting a reroll.\n cf. \n cf. \n source: <20260702140704.65805-1-marcelomlage@usp.br>\n\n\n* ps/t-fixes-for-git-test-long (2026-07-05) 9 commits\n - gitlab-ci: enable \"GIT_TEST_LONG\"\n - gitlab-ci: disable RAM disk on macOS jobs\n - t: use `test_bool_env` to parse GIT_TEST_LONG\n - t7900: clean up large EXPENSIVE repository\n - t7508: skip EXPENSIVE test that is broken without SIZE_T_IS_64BIT\n - t5608: reduce maximum disk usage\n - t4141: fix inefficient use of dd(1)\n - t0021: skip EXPENSIVE test that is broken without SIZE_T_IS_64BIT\n - README: add GitLab CI badge to make it more discoverable\n\n Various test scripts have been updated to clean up large temporary\n files and repositories, reducing peak disk usage during testing.\n Also, expensive tests have been disabled on platforms that lack\n sufficient resources (like 32-bit platforms and Windows CI\n runners), and the long test suite has been enabled in GitLab CI.\n\n Will merge to 'next'?\n cf. <20260707043026.GB677056@coredump.intra.peff.net>\n source: <20260706-b4-pks-t-fixes-for-GIT-TEST-LONG-v3-0-4f6c5a37fd1f@pks.im>\n\n\n* ih/precompose-flex-array (2026-07-04) 1 commit\n - precompose_utf8: use a flex array for d_name\n\n The UTF-8 precomposition wrapper on macOS has been updated to use a\n flexible array member to represent the name of a directory entry,\n preventing fortified libc checks from failing when name is\n reallocated to be larger than NAME_MAX bytes.\n\n Will merge to 'next'.\n cf. <20260703050800.GA29216@tb-raspi4>\n source: <20260704233724.16928-1-ihar.hrachyshka@gmail.com>\n\n\n* sn/osxkeychain-rust-universal (2026-07-06) 3 commits\n - contrib: wire up osxkeychain in contrib/Makefile on macOS\n - Makefile: support universal macOS builds via RUST_TARGETS\n - Makefile: add $(RUST_LIB) prerequisite to osxkeychain\n\n The build system has been updated to support building universal macOS\n binaries when 'Rust' is enabled, by compiling separate static archives\n for each target triple listed in 'RUST_TARGETS' and combining them\n using the macOS 'lipo' tool. Additionally, the 'git-credential-\n osxkeychain' helper has been updated to link against '$(RUST_LIB)'\n when 'Rust' is enabled.\n\n Needs review.\n source: \n\n\n* cl/conditional-config-on-worktree-path (2026-07-02) 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 been taught to use the location of the\n worktree in its condition.\n\n Waiting for response(s) to review comment(s).\n cf. \n cf. \n source: <20260703-includeif-worktree-v6-0-a13893ad9a7f@black-desk.cn>\n\n\n* kk/commit-reach-find-all-fix (2026-06-29) 2 commits\n - commit-reach: guard !FIND_ALL early exit with generation ordering check\n - t6600: add test for merge-base early exit with clock skew\n\n The early-exit optimization in 'paint_down_to_common()' has been gated\n on the queue being generation-ordered, fixing a bug where 'git merge-\n base' (without '--all') could return incorrect results on repositories\n with v1 commit graphs and clock skew.\n\n Comments?\n cf. \n source: \n\n\n* bl/t7412-use-test-path-helpers (2026-06-29) 1 commit\n - submodule absorbgitdirs tests: use test_* helper functions\n\n 't7412' that tests 'git submodule absorbgitdirs' has been modernized\n to use 'test_path_is_file', 'test_path_is_dir', and\n 'test_path_is_missing' helper functions instead of raw 'test -[fde]'\n commands.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260630020220.1559190-1-bblima@usp.br>\n\n\n* jk/format-patch-leakfix (2026-06-29) 2 commits\n (merged to 'next' on 2026-07-06 at 35aff0d609)\n + format-patch: fix leak of rev_info in prepare_bases()\n + t: move LSan errors from stdout to stderr\n\n A memory leak in the '--base' handling of 'git format-patch' has been\n plugged, and the leak-reporting of the test suite when running under a\n TAP harness has been improved.\n\n Will merge to 'master'.\n cf. \n source: <20260630063944.GA3733670@coredump.intra.peff.net>\n\n\n* ps/setup-split-discovery-and-setup (2026-06-30) 16 commits\n - setup: mark `set_git_work_tree()` as file-local\n - setup: pass worktree to `init_db()`\n - setup: drop redundant configuration of `startup_info->have_repository`\n - setup: make repository discovery self-contained\n - setup: propagate prefix via repository discovery\n - setup: drop static `cwd` variable\n - setup: move prefix into repository\n - setup: embed repository format in discovery\n - setup: introduce explicit repository discovery\n - setup: split up concerns of `setup_git_env_internal()`\n - setup: unify setup of shallow file\n - setup: mark bogus worktree in `apply_repository_format()`\n - setup: rename `check_repository_format_gently()`\n - Merge branch 'jk/repo-info-path-keys' into ps/setup-split-discovery-and-setup\n - Merge branch 'ps/setup-drop-global-state' into ps/setup-split-discovery-and-setup\n - Merge branch 'ps/refs-onbranch-fixes' into ps/setup-split-discovery-and-setup\n\n The repository discovery and repository configuration phases, which\n were previously intertwined in 'setup.c', have been split. Repository\n discovery has been updated to populate a 'struct repo_discovery'\n without modifying the repository state, which is then taken by\n repository configuration to initialize the repository, paving the way\n for clean unification of repository configuration.\n\n Needs review.\n (a newer iteration v2 exists as <20260707-pks-setup-split-discovery-and-setup-v2-0-aab372cd227c@pks.im>)\n source: <20260630-pks-setup-split-discovery-and-setup-v1-0-13864eb5a032@pks.im>\n\n\n* pw/rebase-drop-notes-with-commit (2026-06-30) 15 commits\n - amend! sequencer: simplify pick_one_commit()\n - amend! sequencer: remove unnecessary \"or\" in pick_one_commit()\n - fixup! sequencer: never reschedule on failed commit\n - fixup! sequencer: be more careful with external merge\n - sequencer: do not record dropped commits as rewritten\n - sequencer: use an enum to represent result of picking a commit\n - sequencer: return early from pick_one_commit() on success\n - sequencer: simplify pick_one_commit()\n - sequencer: remove unnecessary condition in pick_one_commit()\n - sequencer: simplify handing of fixup with conflicts\n - sequencer: remove unnecessary \"or\" in pick_one_commit()\n - sequencer: never reschedule on failed commit\n - sequencer: be more careful with external merge\n - sequencer: move definition of is_final_fixup()\n - t3400: restore coverage for note copying with apply backend\n\n The rebase post-rewrite notes-copying logic has been corrected. When a\n commit is dropped during rebase (e.g., because its changes are already\n upstream), it is no longer recorded as rewritten, preventing its notes\n from being copied to an unrelated commit.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* jk/bloom-leak-fixes (2026-06-30) 3 commits\n - line-log: drop extra copy of range with bloom filters\n - revision: avoid leaking bloom keyvecs with multiple traversals\n - bloom: make bloom-filter slab initialization idempotent\n\n Various memory leaks in the Bloom-filter code paths that are exposed\n when running tests with the 'GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1'\n environment variable have been plugged.\n\n Will merge to 'next'.\n cf. \n cf. \n source: <20260701063538.GA2579765@coredump.intra.peff.net>\n\n\n* js/ci-dockerized-pid-limit (2026-07-04) 1 commit\n - ci(dockerized): raise the PID limit for private repositories\n\n Dockerized CI jobs running in private GitHub repositories have been\n adjusted to use explicit process and file limits, preventing resource\n exhaustion errors on private runners.\n\n Will merge to 'next'.\n cf. \n source: \n\n\n* js/coverity-fixes (2026-07-05) 12 commits\n - mingw: make `exit_process()` own the process handle on all paths\n - fsmonitor: plug token-data leak on early daemon-startup failures\n - reftable/table: release filter on error path\n - imap-send: avoid leaking the IMAP upload buffer\n - worktree: fix resource leaks when branch creation fails\n - submodule: fix cwd leak in `get_superproject_working_tree()`\n - dir: free allocations on parse-error paths in `read_one_dir()`\n - line-log: avoid redundant copy that leaks in process_ranges\n - run-command: avoid `close(-1)` in `start_command()` error paths\n - download_https_uri_to_file(): do not leak fd upon failure\n - loose: avoid closing invalid fd on error path\n - load_one_loose_object_map(): fix resource leak\n\n Various resource leaks, invalid file descriptor closures, and process\n handle ownership issues flagged by Coverity have been fixed.\n\n Needs review.\n source: \n\n\n* tb/repack-geometric-cruft (2026-06-28) 11 commits\n - SQUASH??? bare grep !???\n - repack: support combining '--geometric' with '--cruft'\n - pack-objects: support '--refs-snapshot' with 'follow-reachable'\n - pack-objects: introduce '--stdin-packs=follow-reachable'\n - pack-objects: extract `stdin_packs_add_all_pack_entries()`\n - repack-geometry: drop unused redundant-pack removal\n - repack: delete geometric packs via existing_packs\n - repack: teach MIDX retention about geometric rollups\n - repack: mark geometric progression of packs as retained\n - repack: extract `locate_existing_pack()` helper\n - repack: unconditionally exclude non-kept packs\n\n 'git repack' has been taught to accept '--geometric' and '--cruft'\n together. When both are given, the geometric repack rolls up non-cruft\n packs as usual, while a separate cruft pack is written to collect\n unreachable objects.\n\n Expecting a reroll.\n cf. \n source: \n\n\n* jk/reftable-leakfix (2026-06-28) 1 commit\n (merged to 'next' on 2026-07-06 at 55ce81f2d5)\n + reftable: fix unlikely leak on API error\n\n A memory leak in the 'reftable_writer_new()' initialization function\n has been fixed by delaying the allocation of 'struct reftable_writer'\n until after input options are validated.\n\n Will merge to 'master'.\n cf. \n source: <20260628090314.GA661068@coredump.intra.peff.net>\n\n\n* ad/gpg-strip-cr-before-lf (2026-06-24) 1 commit\n (merged to 'next' on 2026-07-06 at b099249efd)\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 Will merge to 'master'.\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 Expecting a reroll.\n cf. \n cf. \n cf. \n source: <20260624041920.2601961-1-jltobler@gmail.com>\n\n\n* ps/odb-drop-whence (2026-07-02) 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\n The 'whence' field in 'struct object_info' has been removed,\n refactoring backend-specific object information retrieval into an opt-\n in 'struct object_info_source' structure.\n\n Will merge to 'next'.\n cf. \n source: <20260702-b4-pks-odb-drop-whence-v2-0-b0af7468ad95@pks.im>\n\n\n* ps/reftable-hardening (2026-07-03) 12 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 - t/unit-tests: introduce test helper to write reftable blocks\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: <20260703-pks-reftable-hardening-v3-0-b87c555b9920@pks.im>\n\n\n* hn/branch-push-slip-advice (2026-06-27) 2 commits\n (merged to 'next' on 2026-07-06 at acdff65ac5)\n + push: suggest for a slash slip\n + branch: suggest / on upstream slip\n\n When 'git push origin/main' or 'git branch origin main' is run, the\n command is now recognized as a potential typo, and advice has been\n added to offer a typofix.\n\n Will merge to 'master'.\n cf. \n source: \n\n\n* jc/history-message-prep-fix (2026-06-29) 1 commit\n (merged to 'next' on 2026-07-06 at 00534a21ce)\n + history: streamline message preparation and plug file stream leak\n\n A write file stream resource leak has been fixed as part of a code\n cleanup.\n\n Will merge to 'master'.\n cf. \n source: \n\n\n* ty/migrate-excludes-file (2026-07-01) 1 commit\n - environment: move excludes_file into repo_config_values\n\n The 'excludes_file' and various other global configuration variables\n (including 'editor_program', 'pager_program', 'askpass_program', and\n 'push_default') have been migrated into the per-repository structure.\n\n Waiting for response(s) to review comment(s).\n (a newer iteration v7 exists as <20260706142530.3681520-1-cat@malon.dev>)\n cf. \n source: <20260701180813.776173-2-cat@malon.dev>\n\n\n* kk/merge-base-exhaustion (2026-07-01) 10 commits\n . commit-reach: remove commit-date ordering fallback\n . commit-reach: move min_generation check into paint_queue_get()\n . commit-reach: terminate merge-base walk when one paint side is exhausted\n . commit-reach: introduce struct paint_state with per-side counters\n . t6600: add clock-skew topologies and step counts for edge cases\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 . test-lib-functions: improve diagnostic output for trace2 data assertions\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 Expecting a reroll.\n cf. \n cf. \n cf. \n source: \n\n\n* ps/libgit-in-subdir (2026-06-30) 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\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 Comments?\n cf. \n source: <20260701-pks-libgit-in-subdir-v3-0-5e4860056094@pks.im>\n\n\n* ps/odb-generalize-prepare (2026-06-22) 3 commits\n (merged to 'next' on 2026-07-06 at 6132517517)\n + odb: introduce `odb_prepare()`\n + odb/source: generalize `reprepare()` callback\n + Merge branch 'ps/odb-source-packed' into ps/odb-generalize-prepare\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 allow\n pre-opening object database sources.\n\n Will merge to 'master'.\n cf. <87ik704f1j.fsf@emacs.iotcl.com>\n source: <20260622-b4-pks-odb-generalize-prepare-v1-0-d2a5c5d13144@pks.im>\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-27) 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 The 'git log -L:' command has been taught to limit\n various 'diff' operations, such as '--stat', '--check', and '-G', to\n the specified range:path.\n\n Needs review.\n source: \n\n\n* hn/history-squash (2026-07-06) 5 commits\n - history: re-edit a squash with every message\n - sequencer: extract helpers for the squash message markers\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 'squash'\n subcommand to fold a range of commits into a single commit, replaying\n any descendants on top.\n\n Waiting for response(s) to review comment(s).\n cf. <38493ca6-8fdd-4b6c-9972-5145f3bf0aa4@gmail.com>\n source: \n\n\n* ps/refs-writing-subcommands (2026-07-06) 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 Will merge to 'next'.\n source: <20260706-pks-refs-writing-subcommands-v4-0-d51f6ce7f830@pks.im>\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 Comments?\n source: \n\n\n* mm/test-grep-lint (2026-07-05) 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 The test suite has been updated to use the 'test_grep' helper instead\n of bare 'grep' for test assertions, allowing file contents to be\n printed on failure for easier debugging. A new 'greplint' linter has\n been introduced to detect and prevent new bare 'grep' assertions from\n being added to the test suite.\n\n Needs review.\n source: \n\n\n* kk/prio-queue-get-put-fusion (2026-06-08) 2 commits\n (merged to 'next' on 2026-07-06 at aa748c4564)\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\n directly into 'prio_queue' itself, speeding up commit traversal\n workflows and simplifying callers.\n\n Will merge to 'master'.\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 Comments?\n cf. \n source: <20260612-ref-filter-memoized-contains-v4-0-5ed39fd001dd@gmail.com>\n\n\n* tc/replay-linearize (2026-07-02) 3 commits\n - replay: offer an option to linearize the commit topology\n - replay: resolve the replay base outside pick_regular_commit()\n - replay: add helper to put entry into replayed_commits\n\n The 'git replay' command has been taught the '--linearize' option to\n drop merge commits and linearize the replayed history, mimicking 'git\n rebase --no-rebase-merges'.\n\n Waiting for response(s) to review comment(s).\n cf. \n source: <20260702-toon-git-replay-drop-merges-v6-0-78a07cdd0382@iotcl.com>\n\n\n* ps/cat-file-remote-object-info (2026-07-01) 13 commits\n - cat-file: make remote-object-info allow-list dynamic\n - cat-file: validate remote atoms with an 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: make `write_fetch_command_and_capabilities()` more generic\n - fetch-pack: move `write_fetch_command_and_capabilities()` to connect.c\n - fetch-pack: drop static `advertise_sid` variable\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 `strtoumax_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. Format placeholders are dynamically\n filtered on the client based on server-advertised capabilities,\n returning empty strings for inapplicable or unsupported fields.\n\n Expecting a reroll.\n cf. \n source: <20260701-ps-eric-work-rebase-v15-0-c88a43b63917@gmail.com>\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, ensuring aliases of\n the current branch are skipped and duplicate updates are avoided to\n prevent failures when branch aliases are present.\n\n Waiting for response(s) to review comment(s) for too long, stalled.\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,\n allowing 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* 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 Comments?\n cf. \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* ps/history-drop (2026-07-01) 11 commits\n - builtin/history: implement \"drop\" subcommand\n - builtin/history: split handling of ref updates into two phases\n - replay: expose `replay_result_queue_update()`\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 Will merge to 'next'.\n cf. \n cf. \n source: <20260701-b4-pks-history-drop-v8-0-19b5cdf1facd@pks.im>\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 for 'git interpret-trailers' has been updated to explain\n the format of trailer keys (alphanumeric characters and hyphens),\n replace outdated terminology, define key terms upfront, and document\n how comment lines in the input are treated.\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 Path completion for commands like 'git rm' and 'git mv' has been\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 Support for '-m', '-F', '-c', or '-C' options to supply a commit log\n message from outside the editor has been added for all 'git commit\n --fixup' variations.\n\n Comments?\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 Documentation for 'git replay' has been updated to refer to its\n configuration variables.\n\n Comments?\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 The 'git branch' command has been taught the '--delete-merged' option\n to remove local branches that have already been merged to the remote-\n tracking branches they track.\n\n Needs review.\n source: \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 The 'git checkout --track=...' command has been taught to optionally\n fetch the branch from the remote the new branch will work with.\n\n Comments?\n cf. \n source: \n\n\n* ps/shift-root-in-graph (2026-07-04) 3 commits\n - graph: indent visual root in graph\n - graph: add a 2 commit buffer for lookahead\n - lib-log-graph: move check_graph function\n\n 'git log --graph' has been modified to visually distinguish parentless\n 'root' commits (and commits that become roots due to history\n simplification) by indenting them, preventing them from appearing\n falsely related to unrelated commits rendered immediately above them.\n\n Expecting a reroll.\n cf. \n source: <20260704-ps-pre-commit-indent-v7-0-a94706cc8376@gmail.com>\n"},{"id":"547484","messageId":"CAL71e4MrQ25WJHp-08bTS2=y-gd36zs9CVYmYGeRv-6iCpdfdQ@mail.gmail.com","threadId":"65943","inReplyTo":"xmqqeche67lr.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2026, #03)","fromName":"Kristofer Karlsson","fromEmail":"krka@spotify.com","sentAt":"2026-07-08T11:45:54Z","receivedAt":"2026-07-08T11:46:05Z","isPatch":false,"body":"On Tue, 7 Jul 2026 at 19:19, Junio C Hamano wrote:\n>\n> * kk/commit-reach-find-all-fix (2026-06-29) 2 commits\n> - commit-reach: guard !FIND_ALL early exit with generation ordering check\n> - t6600: add test for merge-base early exit with clock skew\n>\n> The early-exit optimization in 'paint_down_to_common()' has been gated\n> on the queue being generation-ordered, fixing a bug where 'git merge-\n> base' (without '--all') could return incorrect results on repositories\n> with v1 commit graphs and clock skew.\n>\n> Comments?\n> cf. \n> source: \n\n[snip]\n\n> * kk/merge-base-exhaustion (2026-07-01) 10 commits\n> . commit-reach: remove commit-date ordering fallback\n> . commit-reach: move min_generation check into paint_queue_get()\n> . commit-reach: terminate merge-base walk when one paint side is exhausted\n> . commit-reach: introduce struct paint_state with per-side counters\n> . t6600: add clock-skew topologies and step counts for edge cases\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> . test-lib-functions: improve diagnostic output for trace2 data assertions\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\nSmall note regarding these two - kk/merge-base-exhaustion is\n(unfortunately) dependent on kk/commit-reach-find-all-fix\nbefore a reroll.\n\nI tried building v6 of kk/merge-base-exhaustion on top of\nkk/commit-reach-find-all-fix but since that one is based\non kk/paint-down-to-common-optim it does not include\nthe changes from kk/commit-reach-optim which I also depend\non.\n\nI thus think the status of kk/merge-base-exhaustion should\ninstead be:\n\"On hold, waiting for kk/commit-reach-find-all-fix to land first.\"\n\nAlternatively you could rebase kk/commit-reach-find-all-fix\non master (triggers a small conflict though) and that would\nalso unblock a reroll (but I don't want to generate more work for you).\n\nThanks,\nKristofer\n"},{"id":"547507","messageId":"xmqq33xtwj9m.fsf@gitster.g","threadId":"65943","inReplyTo":"CAL71e4MrQ25WJHp-08bTS2=y-gd36zs9CVYmYGeRv-6iCpdfdQ@mail.gmail.com","subject":"Re: What's cooking in git.git (Jul 2026, #03)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2026-07-08T16:14:45Z","receivedAt":"2026-07-08T16:14:48Z","isPatch":false,"body":"Kristofer Karlsson writes:\n\n> I tried building v6 of kk/merge-base-exhaustion on top of\n> kk/commit-reach-find-all-fix but since that one is based\n> on kk/paint-down-to-common-optim it does not include\n> the changes from kk/commit-reach-optim which I also depend\n> on.\n>\n> I thus think the status of kk/merge-base-exhaustion should\n> instead be:\n> \"On hold, waiting for kk/commit-reach-find-all-fix to land first.\"\n>\n> Alternatively you could rebase kk/commit-reach-find-all-fix\n> on master (triggers a small conflict though) and that would\n> also unblock a reroll (but I don't want to generate more work for you).\n\n\nWhen topic A depends on topic B and topic C, rather than rebasing A\non 'next' (if B and C are in 'next'), I would often do\n\n $ git checkout -b A master\n $ git merge --no-ff B\n $ git merge --no-ff C\n\nthese days to prepare the \"base\" to apply patches that belong to A.\n\nMany contributors mimic this and state in their cover letter that\nthe patches in the series are to be applied on top of master at\ncommit X with branches Y and Z merged, or something to that effect.\n\nThanks.\n"},{"id":"547522","messageId":"CAL71e4O+9MEf59XkC4iqPoxt4T6iZ174hWrPTDcjPoWaURj=aA@mail.gmail.com","threadId":"65943","inReplyTo":"xmqq33xtwj9m.fsf@gitster.g","subject":"Re: What's cooking in git.git (Jul 2026, #03)","fromName":"Kristofer Karlsson","fromEmail":"krka@spotify.com","sentAt":"2026-07-08T18:03:48Z","receivedAt":"2026-07-08T18:04:00Z","isPatch":false,"body":"On Wed, 8 Jul 2026 at 18:14, Junio C Hamano wrote:\n>\n> When topic A depends on topic B and topic C, rather than rebasing A\n> on 'next' (if B and C are in 'next'), I would often do\n>\n> $ git checkout -b A master\n> $ git merge --no-ff B\n> $ git merge --no-ff C\n>\n> these days to prepare the \"base\" to apply patches that belong to A.\n>\n> Many contributors mimic this and state in their cover letter that\n> the patches in the series are to be applied on top of master at\n> commit X with branches Y and Z merged, or something to that effect.\n\nYes, that worked locally for me but I think my mistake was\nthat I started off using gitgitgadget which only supports\nworkflows that reference an existing remote branch as base.\nIn the future I will try to learn the b4 tool so I can save myself\nsome headache.\n\nThanks for the guidance,\nKristofer\n"}]}