What's cooking in git.git (Aug 2026, #03)
Junio C Hamano <[email protected]>
| Newsgroups | org.kernel.vger.git |
|---|---|
| Message-ID | <[email protected]> |
Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and is a candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all. They may be annotated with a URL to a message that raises issues but they are by no means exhaustive. A topic without enough support may be discarded after a long period of no activity (of course, it can be resubmitted when new interest arises). The 11th batch of topics have now graduated to the 'master' branch. We have 401 non-merge commits in 'master' since Git 2.55. There are 55 non-merge commits cooking in 'next' (note that some have been reverted), and 235 non-merge commits, including those in and out of 'next', in 'seen' as of this writing. Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. With maint, master, next, seen, todo: git://git.kernel.org/pub/scm/git/git.git/ git://repo.or.cz/alt-git.git/ https://kernel.googlesource.com/pub/scm/git/git/ https://github.com/git/git/ https://gitlab.com/git-scm/git/ With all the integration branches and topics broken out: https://github.com/gitster/git/ Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages): git://git.kernel.org/pub/scm/git/git-htmldocs.git/ https://github.com/gitster/git-htmldocs.git/ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- [Graduated to 'master'] * dl/pack-bitmap-position-zero (2026-07-28) 1 commit (merged to 'next' on 2026-07-31 at b200bed995) + pack-bitmap: handle objects at bitmap position zero A boundary case check in reachability bitmap traversal has been corrected to properly handle the object at position zero, which was previously skipped, leading to redundant bitmap loading. Graduated to 'master'. cf. <amk75SuhyHBbx-E8@com-79390> cf. <[email protected]> source: <[email protected]> * ds/sparse-index-ita-crash (2026-07-06) 1 commit (merged to 'next' on 2026-07-31 at 21b8a5bc05) + sparse-index: avoid crash on intent-to-add entry outside the cone A crash in the 'sparse-index' collapse code when encountering an invalidated cache-tree node (due to an intent-to-add path) has been fixed by avoiding collapsing such subtrees. Graduated to 'master'. cf. <[email protected]> source: <[email protected]> * jk/cat-file-batch-wo-type-fix (2026-07-28) 1 commit (merged to 'next' on 2026-07-31 at 2d67bd3ccf) + cat-file: handle content request for --batch-command without type 'git cat-file --batch-command' that asked for 'contents' without 'type' segfaults, which has been corrected. Graduated to 'master'. cf. <[email protected]> source: <[email protected]> * jk/diff-relative-cached-unmerged-more (2026-07-26) 3 commits (merged to 'next' on 2026-07-30 at d8636bd744) + diff-lib: skip paths outside prefix in oneway_diff() + diff-lib: drop stale comment about advancing o->pos + Merge branch 'jk/diff-relative-cached-unmerged' into jk/diff-relative-cached-unmerged-more The code path that deals with relative paths in the 'diff-lib' has been cleaned up. Graduated to 'master'. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * mm/revision-pure-get-commit-action (2026-07-15) 1 commit (merged to 'next' on 2026-07-31 at ae6730749f) + revision: make get_commit_action() a pure predicate The get_commit_action() function has been refactored to be a pure predicate by moving the side-effecting line-level log range folding to simplify_commit(). This ensures that evaluating a commit's action before the walk reaches it does not prematurely mutate its tracked line ranges, making it safer for potential lookahead evaluations. Graduated to 'master'. cf. <[email protected]> source: <[email protected]> * tc/merge-default-to-upstream-leakfix (2026-07-28) 1 commit (merged to 'next' on 2026-07-31 at b10497d8a4) + merge: fix leak with merge.defaultToUpstream A memory leak in 'git merge' when run without arguments (which triggers the default-to-upstream path) has been fixed. A test has been added to cover this case. Graduated to 'master'. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> -------------------------------------------------- [New Topics] * ss/repack-drop-filtered (2026-08-06) 8 commits - SQUASH??? - Documentation/git-repack: document --drop-filtered and --dry-run - builtin/repack: add guards for --drop-filtered - builtin/repack: actually drop filtered promisor blobs - builtin/repack: enumerate promisor blobs for --drop-filtered - repack-promisor: allow excluding objects from the rebuilt promisor pack - list-objects-filter: add list_objects_filter__filter_oidset() - builtin/repack.c: add --drop-filtered and --dry-run options 'git repack' has been taught '--drop-filtered' to delete local promisor blobs exceeding a limit (currently 'blob:limit=') in partial clones, reclaiming space. Guards prevent running during other operations or if referenced by the index. Expecting a reroll. cf. <CAGWgyh9sDrHb2nXw+mmgQg4-x_H-_mLcwtpAt7QFYHydWNDg+w@mail.gmail.com> source: <[email protected]> * ty/repo-config-cleanups (2026-08-07) 3 commits - environment: remove inaccurate repo_config_values comments - environment: clarify repository config getter documentation - environment: drop redundant NULL checks in config getters Repository configuration getters in 'environment.c' have been simplified by removing redundant NULL checks. The documentation for these getters in 'environment.h' has been clarified, and inaccurate section comments inside 'struct repo_config_values' have been removed. Needs review. source: <[email protected]> * vm/complete-history (2026-08-06) 4 commits - completion: complete 'git history split' pathspecs - completion: complete 'git history --update-refs' values - completion: complete 'git history --empty' values - completion: add 'git history' subcommands The command line completion (in contrib/) has been taught to handle the experimental 'git history' command. Waiting for review. cf. <[email protected]> source: <[email protected]> * cc/lazy-fetch-trusted-bit (2026-08-07) 5 commits - builtin/upload-pack: set GIT_NO_LAZY_FETCH to 0 on trusted repo - upload-pack: read uploadpack.lazyFetchTrusted - setup: add 'allow_dot' arg to path_allowlist_apply() - setup: extract path_allowlist_apply() - promisor-remote: factor out lazy_fetch_objects() Expecting a reroll. cf. <CAP8UFD3txHujpg_NxZN9m4VbH2Yp5g38ZV3=HrXrDrFSHLpaQg@mail.gmail.com> source: <[email protected]> * dk/use-nsec-runtime (2026-08-07) 3 commits - core: convert build-time USE_NSEC into runtime core.useNanosec - environment: align repo_config_values_init with struct declaration - meson: expose knob for xmlto relative links in manuals Waiting for response. cf. <[email protected]> source: <[email protected]> * ps/t7900-deflake-maintenance (2026-08-07) 2 commits - t7900: fix flaky "maintenance.strategy" test - t7900: adapt some tests to use a throwaway repository Needs review. source: <[email protected]> -------------------------------------------------- [Stalled] * bl/t7412-use-test-path-helpers (2026-06-29) 1 commit - submodule absorbgitdirs tests: use test_* helper functions The test script 't7412' that tests 'git submodule absorbgitdirs' has been modernized to use test_path_is_file(), test_path_is_dir(), and test_path_is_missing() helper functions instead of raw 'test -[fde]' commands. Waiting for response for too long, stalled. cf. <[email protected]> source: <[email protected]> * tb/repack-geometric-cruft (2026-06-28) 11 commits - SQUASH??? bare grep !??? - repack: support combining '--geometric' with '--cruft' - pack-objects: support '--refs-snapshot' with 'follow-reachable' - pack-objects: introduce '--stdin-packs=follow-reachable' - pack-objects: extract `stdin_packs_add_all_pack_entries()` - repack-geometry: drop unused redundant-pack removal - repack: delete geometric packs via existing_packs - repack: teach MIDX retention about geometric rollups - repack: mark geometric progression of packs as retained - repack: extract `locate_existing_pack()` helper - repack: unconditionally exclude non-kept packs 'git repack' has been taught to accept '--geometric' and '--cruft' together. When both are given, non-cruft packs are rolled up by the geometric repack as usual, while a separate cruft pack is written to collect unreachable objects. Waiting for response for too long, stalled. cf. <[email protected]> cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * hn/checkout-track-fetch (2026-06-24) 2 commits - checkout: extend --track with a "fetch" mode to refresh start-point - branch: expose helpers for finding the remote owning a tracking ref The 'git checkout --track=...' command has been taught to optionally fetch the branch from the remote that the new branch will work with. Will discard. cf. <[email protected]> source: <[email protected]> * za/completion-hide-dotfiles (2026-06-20) 2 commits - completion: hide dotfiles by default for path completion - completion: hide dotfiles for selected path completion Path completion for commands like 'git rm' and 'git mv' has been updated to hide dotfiles by default unless the user explicitly starts the path with a dot, matching standard shell-completion behavior. Waiting for response for too long, stalled. cf. <[email protected]> source: <[email protected]> -------------------------------------------------- [Cooking] * ps/odb-streams (2026-08-05) 8 commits - odb/streaming: unify function names to create new streams - odb/streaming: rename `struct input_zstream_data` - odb/streaming: rename `struct read_object_fd_data` - odb/streaming: consolidate read and write streams - odb/streaming: rename `struct odb_read_stream` - odb/streaming: support streaming arbitrary object types - odb/streaming: drop `is_finished` field - odb/streaming: track write stream size in the structure The 'struct odb_read_stream' and 'struct odb_write_stream' structures have been consolidated into a single unified 'struct odb_stream' structure, simplifying object database streaming APIs and enabling streaming of arbitrary object types. Needs review. source: <[email protected]> * bc/restrict-hex-to-lowercase (2026-07-29) 6 commits - hex: allow only lowercase object IDs in breaking changes mode - object-name: use hexval - hex: label usages of hex parsing for object IDs - hex: make hex_to_bytes accept kind of hex to use - hex: allow specifying hex type with hex2chr - hex: add functionality for lowercase-only hex The parser for hex object names has been updated to reject uppercase hexadecimal characters when running in the breaking changes mode, in preparation for Git 3.0. Waiting for review. cf. <[email protected]> source: <[email protected]> * js/mingw-build-updates (2026-08-05) 12 commits - mingw: allow `git.exe` to be used instead of the "Git wrapper" - mingw: ensure valid CTYPE - mingw: always define `ETC_*` for MSYS2 environments - windows: skip linking `git-<command>` for built-ins - mingw: rely on MSYS2's metadata instead of hard-coding it - mingw: only enable the MSYS2-specific stuff when compiling in MSYS2 - mingw: set the prefix and HOST_CPU as per MSYS2's settings - mingw: avoid over-specifying `--pic-executable` - mingw: only use -Wl,--large-address-aware for 32-bit builds - mingw: drop the -D_USE_32BIT_TIME_T option - mingw: stop hard-coding `CC = gcc` - mingw: include the Python parts in the build A collection of patches from Git for Windows has been upstreamed, mostly focusing on simplifying and robustifying build configurations for MinGW/MSYS2, dropping obsolete compatibility options, and allowing the main 'git.exe' to be used directly without the extra wrapper process on Windows. Expecting a reroll. cf. <[email protected]> source: <[email protected]> * yn/worktree-add-no-dwim-with-b (2026-08-05) 1 commit - worktree add: shouldn't dwim if -b or -B is given 'git worktree' add did not prevent DWIM behavior when '-b' or '-B' was specified, which has been corrected. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * hn/ci-cancel-stale-pr-runs (2026-07-31) 1 commit - ci: cancel stale pull request workflow runs GitHub Actions CI workflow runs triggered by pull requests have been configured to cancel older runs when a new push is made to the same pull request. Needs review. source: <[email protected]> * kh/doc-refs-migrate-limitations (2026-08-05) 2 commits - doc: refs: linkgit to git-maintenance(1) - doc: refs: put ref migration warning under the command The known limitations of the ref format migration in 'git refs' have been moved to be displayed as a warning admonition directly under the description of the 'migrate' subcommand, improving visibility. A reference to 'git-maintenance' has also been corrected to use the 'linkgit' macro. Will merge to 'next'? cf. <[email protected]> cf. <CAOLa=ZQQnrRca60BAfnm6Azu=bHvnoVhcGwQ3KkDT7yqLDd8Dw@mail.gmail.com> source: <[email protected]> * jc/complete-diff-tracked-paths (2026-08-07) 3 commits - completion: 'git diff' completes untracked paths as a last resort - completion: complete tracked paths for 'git diff' - completion: no-op refactoring of diff completion 'git -C <dir> diff fi<TAB>' did not complete 'dir/file', which has been corrected. Will merge to 'next'? cf. <CABPp-BFdwxTvkcWKNP0-Lk+mqQLnULoYuLHZe0aot4VYfHnjSw@mail.gmail.com> source: <[email protected]> * kh/trailers-no-urls (2026-08-02) 2 commits - trailers: stop recognizing URLs as trailers - Merge branch 'kh/doc-trailers' into kh/trailers-no-urls (this branch uses kh/doc-trailers.) The trailers code has been taught to avoid mistaking a line that has '<token>://' at the beginning as a trailer line. On hold, waiting for the base topic. cf. <[email protected]> cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * kl/t7528-ssh-agent-for-csh-users (2026-08-02) 1 commit - t7528: fix failure under csh The 'ssh-agent' tests in 't7528' have been fixed to work when the user's login shell is csh-like, by explicitly passing '-s' to 'ssh-agent' to force Bourne shell syntax. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * kh/doc-trailers (2026-07-30) 11 commits - doc: interpret-trailers: document comment line treatment - doc: interpret-trailers: rewrite new-trailers paragraphs - doc: interpret-trailers: commit to “trailer block” term - doc: interpret-trailers: join new-trailers again - doc: interpret-trailers: add key format example - doc: interpret-trailers: explain key format - doc: interpret-trailers: explain the format after the intro - doc: interpret-trailers: not just for commit messages - doc: interpret-trailers: use “metadata” in Name as well - doc: interpret-trailers: replace “lines” with “metadata” - doc: interpret-trailers: stop fixating on RFC 822 (this branch is used by kh/trailers-no-urls.) Documentation for 'git interpret-trailers' has been updated to explain the format of trailer keys (alphanumeric characters and hyphens), replace outdated terminology, define key terms upfront, and document how comment lines in the input are treated. Waiting for response. cf. <CALnO6CAmM4r2uiuBFJcciR_94KPRSJoCOsuNKeqTQ0Bt=Puvyw@mail.gmail.com> cf. <[email protected]> source: <[email protected]> * kh/doc-replay-config (2026-07-30) 4 commits (merged to 'next' on 2026-08-03 at 5450adb2e1) + doc: replay: move “default” to the right-hand side + doc: replay: use a nested description list + doc: replay: improve config description + doc: link to config for git-replay(1) Documentation for 'git replay' has been updated to refer to its configuration variables. Will merge to 'master'. cf. <[email protected]> source: <[email protected]> * sk/test-commit-body-helper (2026-07-27) 2 commits (merged to 'next' on 2026-08-03 at ce42e63135) + t: use commit_body to extract commit message bodies + test-lib-functions: add commit_body helper A new test helper commit_body() has been introduced to print the message body of a commit, and various tests have been updated to use it instead of spelling out the command pipeline manually and losing the exit status of the 'git cat-file' command on the upstream of the pipe. Will merge to 'master'. cf. <[email protected]> source: <[email protected]> * cl/regexec-macos-leak (2026-07-28) 2 commits - SQUASH??? - regexec: work around macOS TRE leak on invalid UTF-8 A compatibility workaround has been introduced for macOS to address a memory leak in the system regex engine when it encounters invalid multibyte sequences. The workaround segments the input buffer at invalid byte boundaries and searches each valid segment separately using regexec(), avoiding the leaking path. Waiting for response. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * hn/checkout-m-autostash-refine (2026-07-25) 2 commits - checkout -m: refine autostash fallback - sequencer: teach autostash apply to report conflicts The autostash fallback in 'git checkout -m' has been refined to only retry when there are local changes. Additionally, a blank line now visually separates autostash conflict advice from the subsequent branch-switch message. Needs review. cf. <[email protected]> source: <[email protected]> * ns/merge-base-is-ancestor-tests (2026-07-29) 1 commit (merged to 'next' on 2026-08-03 at cf2c4e00eb) + merge-base: add tests for --is-ancestor Tests for 'git merge-base --is-ancestor' have been added to cover exit codes (0 for success, 1 for non-ancestor, 128 for errors) and to ensure it cannot be combined with '--all'. Will merge to 'master'. cf. <[email protected]> source: <[email protected]> * jc/add-resolved (2026-07-31) 4 commits - add: introduce '--resolved' option - read-cache: add remove_file_from_index_with_flags() - merge-ll: consolidate conflict marker scanning logic - read-cache: reindent 'git add' has been taught a new '--resolved' option to stage conflict-resolved paths, while leaving unrelated local changes unstaged. It scans the unmerged paths for leftover conflict markers and aborts if any are found. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * tb/pack-with-duplicates (2026-07-24) 5 commits - pack-bitmap: handle duplicate pack entries during MIDX reuse - test-tool bitmap: reject packs with duplicate objects - midx: verify duplicate pack entries by OID and offset - packfile: recover delta cycles through duplicate entries - t5308: test reverse indexes with duplicate objects The handling of packfiles with duplicate object entries has been hardened. Specifically, reverse index lookup, delta cycle recovery, multi-pack-index verification, and pack reuse paths have been updated to correctly handle or gracefully reject duplicate entries. Needs review. cf. <[email protected]> source: <[email protected]> * ps/cat-file-remote-object-info-type (2026-08-04) 10 commits - cat-file: unify default format - serve: advertise type capability - fetch-object-info: parse type from server response - protocol-caps: add type support to object-info - fetch-object-info: die() on the remaining error path - fetch-object-info: use dedicated struct for the results - fetch-object-info: pass arguments directly instead of a struct - fetch-object-info: detect malformed server responses - t5701: use test_file_size() to get the size of a file - Merge branch 'ps/cat-file-remote-object-info' into ps/cat-file-remote-object-info-type The 'remote-object-info' command for 'git cat-file --batch-command' has been extended to support the '%(objecttype)' placeholder. Expecting a reroll. cf. <[email protected]> source: <[email protected]> * lo/mv-missing-dest-dir-check (2026-07-30) 2 commits (merged to 'next' on 2026-08-03 at 7643cf1c2a) + mv: reject a destination whose leading path is missing or a symlink + mv: name both source and destination when rename fails 'git mv' has been updated to check for a missing destination leading directory during the checking phase, allowing 'git mv -n' to report the failure. The error message when the rename(2) syscall fails has also been improved to name both the source and the destination. Will merge to 'master'. cf. <[email protected]> source: <[email protected]> * ps/odb-make-creation-pluggable (2026-08-06) 6 commits - odb: make creation of on-disk structures pluggable - odb/source: introduce function to map source type to name - setup: defer object database creation - setup: handle ODB-related environment variables in `odb_new()` - setup: detangle loading of loose object maps - loose: load loose object map for the correct source The creation of the on-disk data structures for the object database has been made pluggable, allowing future backends to customize their setup. As part of this, the initialization of the object database has been deferred, and the loading of the loose-object map has been detangled from repository initialization. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * hs/rebase-continue-edit (2026-07-21) 1 commit - rebase: add --[no-]edit to --continue Support for skipping the editor when continuing a rebase after conflict resolution has been added with the '--no-edit' option, and forcing it with '--edit'. A new configuration variable 'rebase.noEdit' can be used to set the default behavior. Waiting for response. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * td/fsmonitor-darwin-cookie-flush (2026-07-21) 1 commit - fsmonitor: flush pending FSEvents before cookie wait The 'fsmonitor' daemon on macOS has been updated to flush pending FSEvents before waiting for the cookie file, to avoid premature timeouts on busy systems. Waiting for response. cf. <CAOTNsDy4pKbPHdK1T688Ax6Mgz15K-qfZR-8fAvTk48z3E43Rg@mail.gmail.com> cf. <[email protected]> source: <20260721-fsmonitor-darwin-cookie-flush-v1-1-357dc5e32040@gmail.com> * sn/rebase-update-refs-symrefs (2026-07-22) 2 commits - rebase: guard non-branch symref targets - rebase: skip branch symref aliases 'git rebase --update-refs' has been taught to resolve local branch symrefs to their referents before queuing updates, ensuring aliases of the current branch are skipped and duplicate updates are avoided to prevent failures when branch aliases are present. Waiting for response, stalled. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * ja/doc-synopsis-style-yet-more (2026-07-23) 4 commits (merged to 'next' on 2026-08-03 at c744bba04e) + doc: convert git-request-pull synopsis and options to new style + doc: convert git-send-email synopsis and options to new style + doc: convert git-format-patch synopsis and options to new style + doc: convert git-imap-send synopsis and options to new style Synopsis and options in the documentation for 'git format-patch', 'git imap-send', 'git send-email', and 'git request-pull' have been updated to the modern style. Will merge to 'master'. cf. <[email protected]> source: <[email protected]> * kj/repo-info-more-path-keys (2026-08-06) 7 commits - repo: remove unused setup.h include - repo: add path.git-prefix - repo: add path.grafts with absolute and relative suffixes - repo: add path.index with absolute and relative suffixes - repo: add path.hooks with absolute and relative suffixes - repo: add path.superproject-root with absolute and relative suffixes - repo: add path.toplevel with absolute and relative suffix formatting The 'git repo info' command has been taught more keys to output paths of various repository components (such as the working tree root, superproject working tree, object database, etc.), supporting both absolute and relative path formats. Needs review. source: <[email protected]> * tc/last-modified-bloom (2026-08-07) 6 commits - last-modified: keep per-path Bloom filters for wildcard pathspecs - last-modified: check pathspec against Bloom filter first - revision: add Bloom check that includes parent directories - bloom: add helper to check if any key in a vector is present - revision: expose check for paths maybe changed in Bloom filter - revision: move bloom keyvec precondition into function The 'git last-modified' command has been optimized by using Bloom filters. It now reuses revision walk filtering logic from 'git log' to pre-filter commits, and maintains per-path Bloom filters even when wildcard pathspecs are used. Needs review. source: <[email protected]> * hn/bisect-reset-when-found (2026-08-02) 2 commits - bisect: add --reset-when-found to leave when done - bisect: let bisect_reset() optionally check out quietly The 'git bisect' command has been taught a '--reset-when-found[=<where>]' option that tells the command to automatically run 'git bisect reset' to jump back to the original state or to the found culprit. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * js/coverity-unchecked-returns-fix (2026-08-05) 11 commits - bisect: handle dup() failure when redirecting stdout - bisect: check get_terms return at all call sites - bisect: check strbuf_getline_lf return when reading terms - transport-helper: warn when export-marks file cannot be finalized - transport-helper: check dup() return in get_exporter - compat/pread: check initial lseek for errors - last-modified: handle repo_parse_commit() failures - reftable tests: check reftable_table_init_ref_iterator() return - reftable/block: check deflateInit() return value - config: propagate launch_editor() failure in show_editor() - http: die on curl_easy_duphandle failure in get_active_slot A handful of code paths have been corrected to check return values from functions like curl_easy_duphandle(), deflateInit(), lseek(), dup(), and strbuf_getline_lf(), resolving several Coverity warnings about unchecked returns. Waiting for response. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * ds/trace2-tolerate-failed-timestamp (2026-07-15) 1 commit - trace2: tolerate failed timestamp formatting The 'trace2' telemetry library has been updated to tolerate failures from system calls like gettimeofday() and datetime formatting functions, replacing potential program crashes with blank placeholder timestamps in the traces. Expecting a reroll. cf. <[email protected]> source: <[email protected]> * cc/fast-import-usage (2026-08-04) 12 commits - fast-import: remove useless from_stream argument - fast-import: use parse_options() for command line options - fast-import: use callbacks to parse some options - fast-import: use struct option for usage string - fast-import: move command state globals into 'struct fast_import_state' - fast-import: introduce 'struct fast_import_state' - fast-import: factor out option_*() functions - fast-import: use int for some bool flags - fast-import: localize 'i' into the 'for' loops using it - api-parse-options.adoc: document hidden and OPT_*_F option macros - api-parse-options.adoc: document per-option flags - parse-options: introduce OPT_HIDDEN_GROUP The usage string of 'git fast-import' has been updated to use the parse_options() API for displaying help, and its SYNOPSIS in the documentation has been standardized to match. Needs review. source: <[email protected]> * ps/writev (2026-08-06) 5 commits - fast-import: use writev(3p) to send cat-blob responses - sideband: use writev(3p) to send pktlines - wrapper: properly handle MAX_IO_SIZE in writev(3p) - wrapper: introduce writev(3p) wrappers - compat/posix: introduce writev(3p) wrapper A compatibility wrapper for writev(3p) has been reintroduced, including fixes for CMake build and 'MAX_IO_SIZE' limits on NonStop. Calls to write(3p) in send_sideband() and cat_blob() have been refactored to use writev(3p) wrappers to reduce syscall overhead. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * tb/send-pack-no-ref-delta (2026-07-12) 4 commits - send-pack: honor `no-ref-delta` capability - pack-objects: support reuse with `--no-ref-delta` - pack-objects: introduce `--no-ref-delta` - t/helper: teach pack-deltas to list delta entries 'git send-pack' has been taught to refrain from sending 'REF_DELTA' encoded packfiles when the other side asks it to. Needs review. source: <alQ7WKITYDXfiVn9@com-79390> * tn/packfile-uri-concurrency (2026-07-26) 6 commits - fetch-pack: accept "pack" output for packfile URIs - http: permit unlinking partial packs on Windows - http: avoid concurrent appends to partial packs - http: accept HTTP 416 for complete partial packs - http: avoid closing index-pack input twice - http-fetch: correct --index-pack-arg documentation Concurrent downloads of packfiles via packfile URIs and dumb HTTP are safer by avoiding concurrent appends to the staging file. Opening in read-write mode with separate file offsets prevents corruption and preserves resumability. 'fetch-pack' now tolerates pre-existing '.keep' files. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * js/pack-objects-delta-size-t (2026-08-05) 12 commits - git-zlib: widen `git_deflate_bound()` to `size_t` - t/helper/test-pack-deltas: widen `do_compress()`'s maxsize local to `size_t` - http-push: widen `start_put()`'s size local from `ssize_t` to `size_t` - diff: widen `deflate_it()`'s bound local from int to `size_t` - archive-zip: widen `zlib_deflate_raw()`'s maxsize local to `size_t` - packfile, git-zlib: widen `use_pack()` and zstream avail fields to `size_t` - delta: widen `create_delta()` and `diff_delta()` to `size_t` - pack-objects: widen `mem_usage` and `try_delta()`'s out-param to `size_t` - pack-objects: widen `free_unpacked()` return to `size_t` - pack-objects: widen delta-cache accounting to `size_t` - delta: widen `create_delta_index()` parameter to `size_t` - diff-delta: widen `struct delta_index`' size fields to `size_t` The 'pack-objects' and delta-encoding code paths have been updated to use 'size_t' instead of 'unsigned long' for object sizes and offset limits, avoiding potential truncation issues on 64-bit Windows. Waiting for response. cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * pz/fetch-submodule-errors-config (2026-07-16) 2 commits - fetch: add fetch.submoduleErrors to make submodule fetch errors non-fatal - submodule: fix premature failure in recursive submodule fetch The 'git fetch' command can now configure how submodule fetch errors are handled via 'fetch.submoduleErrors' and '--submodule-errors', making them non-fatal. A premature failure during recursive submodule fetches has been fixed by deferring the error until the OID-based retry phase fails. Needs review. source: <[email protected]> * gr/add-e-use-apply-api (2026-07-10) 1 commit - builtin/add.c: replace run_command() with direct apply_all_patches() call The application of the edited patch in 'git add -e' has been refactored to use the internal apply API directly, avoiding the need to spawn a 'git apply' subprocess. Needs review. cf. <[email protected]> source: <[email protected]> * fz/rebase-autosquash-empty (2026-07-11) 1 commit . sequencer: honor --empty when a fixup!/squash! empties its target A commit that is emptied by melding a 'fixup!' or 'squash!' commit during 'git rebase --autosquash' is now handled according to the '--empty' option, allowing it to be dropped, kept, or to halt the rebase. This topic has been ejected due to conflicts with 'pw/rebase-drop-notes-with-commit'. Waiting for response, stalled cf. <[email protected]> source: <[email protected]> * mm/lib-httpd-cgi-safe (2026-07-10) 3 commits - t/README: document writing concurrency-safe helpers - t/lib-httpd: make http-429 first-request check atomic - t/lib-httpd: fix apply-one-time-script race under concurrent requests CGI helper scripts used by HTTP-related test scripts have been updated to use atomic filesystem operations, preventing race conditions when Apache handles concurrent requests. Expecting a reroll. cf. <CAC2QwmK=K3EqvZWKQpy8ag+A8kMghNB6N=0dW7pjY1xJup4_Xg@mail.gmail.com> cf. <CAC2Qwm+Jni+xU=gaef1AWCMj9+GUQhMrCWX9DFpS3y757pxv=Q@mail.gmail.com> source: <[email protected]> * ij/subtree-reject-v2-config (2026-07-06) 2 commits - git-subtree: Bail out if we find output from Rust rewrite (test) - git-subtree: Bail out if we find output from Rust rewrite The shell script implementation of 'git subtree' has been updated to check for the presence of the configuration file of the new Rust implementation, preventing users from accidentally running the old script on repositories already managed by the new tool. Expecting a reroll. cf. <[email protected]> source: <[email protected]> * jm/t0213-skip-emulated-ancestry-tests (2026-07-06) 1 commit - t0213: skip ancestry tests under user-mode emulation The 'TRACE2_ANCESTRY' prerequisite in the 't0213' test script has been refined to avoid failures under user-mode emulation by verifying that the ancestry collector reports the expected process names rather than the emulator binary name. Will merge to 'next'? cf. <[email protected]> source: <[email protected]> * zy/apply-abandoned-header-fix (2026-07-01) 1 commit - apply: avoid leaking abandoned git-header state A candidate 'git diff' header parsed by 'git apply' has been isolated in a temporary structure, preventing any partially parsed state from polluting the main patch structure and causing assertions to trip if the header is ultimately rejected. Needs review. source: <[email protected]> * ps/libgit-in-subdir (2026-07-12) 3 commits . Move libgit.a sources into separate "lib/" directory . t/helper: prepare "test-example-tap.c" for introduction of "lib/" . Merge branch 'ps/odb-source-packed' into ps/libgit-in-subdir The source files for 'libgit.a' have been moved into a new 'lib/' directory to clean up the top-level directory and clearly separate library code. This topic has been ejected for now, as it causes too many evil merges with other topics. Waiting for response, stalled. cf. <[email protected]> cf. <al6yCTDjBRn2HGq0@com-79390> source: <[email protected]> * mm/line-log-limited-ops (2026-06-27) 7 commits - diffcore-pickaxe: scope -G to the -L tracked range - diff: support --check with -L line ranges - line-log: support diff stat formats with -L - diff: extract a line-range diff helper for reuse - diff: emit -L hunk headers via xdiff's formatter - diff: simplify the line-range filter by classifying removals immediately - diff: rename and group the line-range filter for clarity (this branch is used by mm/diff-process-hunks.) The 'git log -L<range>:<path>' command has been taught to limit various 'diff' operations, such as '--stat', '--check', and '-G', to the specified range and path. Needs review. source: <[email protected]> * hn/history-squash (2026-08-07) 8 commits - history: support editing squashed commit messages - history: create squashed commits without editing - history: protect branches when squashing a range - history: validate squash revision ranges - history: add skeleton for squash subcommand - sequencer: share the squash message marker helpers and flags - history: give commit_tree_ext a message template - history: extract helper for a commit's parent tree The experimental 'git history' command has been taught a new 'squash' subcommand to fold a range of commits into a single commit, with any descendants replayed on top. Needs review. source: <[email protected]> * tb/midx-incremental-custom-base (2026-06-12) 3 commits - midx-write: include packs above custom incremental base - midx: pass custom '--base' through incremental writes - t5334: expose shared `nth_line()` helper The 'git multi-pack-index write --incremental' command has been corrected to properly honor the '--base' option. Previously, the custom base was ignored by the normal write path; packs from layers above the selected base were incorrectly skipped by the pack exclusion logic, and reachability closure for bitmaps was broken. Needs review. source: <[email protected]> * tc/replay-linearize (2026-07-28) 3 commits - replay: offer an option to linearize the commit topology - replay: resolve the replay base outside pick_regular_commit() - replay: add helper to put entry into replayed_commits The 'git replay' command has been taught the '--linearize' option to drop merge commits and linearize the replayed history, mimicking 'git rebase --no-rebase-merges'. Waiting for response. cf. <anYLeQj4Sx2vZqvy@denethor> source: <[email protected]> * mm/diff-process-hunks (2026-08-01) 11 commits - diff: consult oid-only hunk providers via diff.<driver>.process - userdiff: add diff.<driver>.process config - sub-process: add a gentle status read - sub-process: separate process lifecycle from hashmap management - blame: read precomputed hunks - diff: read precomputed hunks for stat output - diff: record precomputed hunks during stat output - diff-hunks: add the store format, library, and command - diff: introduce a hunk provider interface - gitattributes: document how external diff drivers relate to diff features - Merge branch 'mm/line-log-limited-ops' into mm/diff-process-hunks (this branch uses mm/line-log-limited-ops.) A new 'diff.<driver>.process' configuration has been introduced to allow a long-running external process to act as a hunk provider, enabling external tools to control which lines Git considers changed while leaving all output formatting (word diff, color, blame, etc.) to Git's standard pipeline. Waiting for response. cf. <[email protected]> source: <[email protected]> * ec/commit-fixup-options (2026-05-26) 2 commits - commit: allow -c/-C for all kinds of --fixup - commit: allow -m/-F for all kinds of --fixup Support for '-m', '-F', '-c', or '-C' options to supply a commit log message from outside the editor has been added for all 'git commit --fixup' variations. Needs review. source: <[email protected]> * hn/branch-delete-merged (2026-08-05) 7 commits - branch: add --dry-run for --delete-merged - branch: add branch.<name>.deleteMerged opt-out - branch: add --delete-merged <pattern> - branch: prepare delete_branches for a bulk caller - branch: let delete_branches skip unmerged branches on bulk refusal - branch: convert delete_branches() to a flags argument - branch: add --forked filter for --list mode The 'git branch' command has been taught the '--delete-merged' option to remove local branches that are already merged into their tracked remote-tracking branches. Will merge to 'next'? cf. <[email protected]> cf. <[email protected]> source: <[email protected]> * kk/merge-base-exhaustion (2026-08-06) 11 commits - commit-reach: remove commit-date ordering fallback - commit-reach: move min_generation check into paint_queue_get() - commit-reach: terminate merge-base walk when one paint side is exhausted - commit-reach: introduce struct paint_state with per-side counters - t6600: add clock-skew topologies and step counts for edge cases - commit-reach: add trace2 instrumentation to paint_down_to_common() - t6099, t6600: add side-exhaustion regression tests - t6600: add test cases for side-exhaustion edge cases - test-lib-functions: improve diagnostic output for trace2 data assertions - Documentation/technical: add paint-down-to-common doc - Merge branch 'kk/commit-reach-find-all-fix' into kk/merge-base-exhaustion The merge-base computation has been optimized by stopping the walk early when one side's exclusive commits in the queue are exhausted, yielding significant speedups for queries with one-sided histories. Expecting a reroll. cf. <CAL71e4ONrNcOh82upp8YT0b_0nZhxtEv_zFDb_0Sknfc9_kJWA@mail.gmail.com> cf. <CAL71e4OTYDrbY-kjeJSa-iWtUN=96Q+2_vEB-_tScu_afPS6EA@mail.gmail.com> source: <[email protected]>