Skip to contentSkip to conversation

What's cooking in git.git (Jun 2026, #03)

DISCUSSION Junio C Hamano 2 participants 3 messages Jun 9 – Jun 11

lore
Share & tools
lore
#0 lore raw

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 and 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 they can be resubmitted when new interests arise).

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']

* aj/stash-patch-optimize-temporary-index (2026-05-22) 1 commit (merged to 'next' on 2026-05-31 at d1b1dd94f5)
+ stash: reuse cached index entries in --patch temporary index

"git stash -p" has been optimized by reusing cached index entries in its temporary index, avoiding unnecessary lstat() calls on unchanged files.
cf. <[email protected]>
source: <[email protected]>

* ar/receive-pack-worktree-env (2026-05-25) 1 commit (merged to 'next' on 2026-05-27 at 9c246d1969)
+ receive-pack: fix updateInstead with core.worktree

The GIT_WORK_TREE variable prepared to invoke the push-to-checkout hook was leaking into the environment even when there was no hook used and broke the default push-to-deploy (i.e., let "git checkout" update the working tree only when the working tree is clean).
source: <[email protected]>

* ds/restore-sparse-index (2026-05-26) 2 commits
(merged to 'next' on 2026-05-31 at e85a961bc7)
+ restore: avoid sparse index expansion
+ t1092: test 'git restore' with sparse index

'git restore --staged' has been optimized to avoid unnecessarily expanding the sparse index when operating on paths within the sparse checkout definition, by handling sparse directory entries at the tree level.
source: <[email protected]>

* ja/doc-synopsis-style-again (2026-05-25) 6 commits
(merged to 'next' on 2026-05-31 at cc4fe82d87)
+ doc: convert git-imap-send synopsis and options to new style
+ doc: convert git-apply synopsis and options to new style
+ doc: convert git-am synopsis and options to new style
+ doc: convert git-grep synopsis and options to new style
+ doc: git bisect: clarify the usage of the synopsis vs actual command
+ doc: convert git-bisect to synopsis style

A batch of documentation pages has been updated to use the modern synopsis style.
cf. <[email protected]>
source: <[email protected]>

* kh/free-commit-list (2026-05-28) 2 commits
(merged to 'next' on 2026-05-31 at 154f83b192)
+ commit: remove deprecated functions
+ *: replace deprecated free_commit_list

Code clean-up.
source: <[email protected]>

* kk/commit-reach-optim (2026-05-25) 3 commits
(merged to 'next' on 2026-05-31 at eeb8d0c207)
+ commit-reach: replace queue_has_nonstale() scan with O(1) tracking
+ commit-reach: deduplicate queue entries in paint_down_to_common
+ object.h: fix stale entries in object flag allocation table

The check for non-stale commits in the priority queue used by paint_down_to_common and ahead_behind has been optimized by replacing an O(N) scan with an O(1) counter, yielding performance improvements in repositories with wide histories.
cf. <[email protected]>
source: <[email protected]>

--------------------------------------------------
[New Topics]

* ps/odb-source-packed (2026-06-04) 17 commits
- odb/source-packed: drop pointer to "files" parent source
- midx: refactor interfaces to work on "packed" source
- odb/source-packed: stub out remaining functions
- odb/source-packed: wire up freshen_object() callback
- odb/source-packed: wire up find_abbrev_len() callback
- odb/source-packed: wire up count_objects() callback
- odb/source-packed: wire up for_each_object() callback
- odb/source-packed: wire up read_object_stream() callback
- odb/source-packed: wire up read_object_info() callback
- packfile: use higher-level interface to implement has_object_pack()
- odb/source-packed: wire up reprepare() callback
- odb/source-packed: wire up close() callback
- odb/source-packed: start converting to a proper struct odb_source
- odb/source-packed: store pointer to "files" instead of generic source
- packfile: move packed source into "odb/" subsystem
- packfile: rename struct packfile_store to odb_source_packed
- Merge branch 'ps/odb-source-loose' into ps/odb-source-packed (this branch uses ps/odb-source-loose.)

The packed object source has been refactored into a proper struct odb_source.

Comments?
source: <[email protected]>

* ps/transport-helper-tsan-fix (2026-06-04) 1 commit
- transport-helper: fix TSAN race in transfer_debug()

The TSAN race in transfer_debug() within transport-helper.c has been resolved by initializing the debug flag early in bidirectional_transfer_loop() before spawning worker threads, allowing the removal of a TSAN suppression.

Comments?
source: <[email protected]>

* ta/typofixes (2026-06-04) 1 commit
- docs: fix typos

Typofixes

Comments?
source: <[email protected]>

* js/win-kill-child-more-gently (2026-06-04) 2 commits
- mingw: really handle SIGINT
- mingw: kill child processes in a gentler way

Advanced emulation of kill() used on Windows in GfW has been upstreamed to improve the symptoms like left-behind .lock files and that fails to let the child clean-up itself when it gets killed.

Comments?
source: <[email protected]>

* dl/posix-unused-warning-clang (2026-06-08) 2 commits
- compat/posix.h: simplify GIT_GNUC_PREREQ() comparison
- compat/posix.h: enable UNUSED warning messages for Clang

The UNUSED macro in 'compat/posix.h' has been updated to use a newly introduced GIT_CLANG_PREREQ macro for compiler version checks, and the existing GIT_GNUC_PREREQ macro has been modernized to use explicit major/minor comparisons rather than bit-shifting.

Comments?
source: <[email protected]>

* lo/doc-format-patch-subject-prefix (2026-06-04) 1 commit
- Documentation: remove redundant 'instead' in --subject-prefix

Wording used in "format-patch --subject-prefix" documentation has been improved.

Will merge to 'next'.
source: <[email protected]>

* am/doc-tech-hash-typofix (2026-06-05) 1 commit
- doc: fix typo in GIT_ALTERNATE_OBJECT_DIRECTORIES

Typofix.

Will merge to 'next'.
cf. <[email protected]>
source: <[email protected]>

* td/ref-filter-restore-prefix-iteration (2026-06-05) 1 commit
- ref-filter: restore prefix-scoped iteration

Commands that list branches and tags (like git branch and git tag) have been optimized to pass the namespace prefix when initializing their ref iterator, avoiding a loose-ref scaling regression in repositories with many unrelated loose references.

Comments?
source: <[email protected]>

* ty/move-protect-hfs-ntfs (2026-06-06) 1 commit
- environment.c: move 'protect_hfs' and 'protect_ntfs' into 'repo_config_values'

The global configuration variables protect_hfs and protect_ntfs have been migrated into struct repo_config_values to tie them to per-repository configuration state.

Comments?
source: <[email protected]>

* ds/config-no-includes (2026-06-08) 3 commits
- git: add --no-includes top-level option
- config: add GIT_CONFIG_INCLUDES
- git-config.adoc: fix paragraph break

Two new mechanisms, the GIT_CONFIG_INCLUDES environment variable and the top-level --no-includes command-line option, have been introduced to ignore configuration include directives.

Comments?
source: <[email protected]>

* ps/cat-file-remote-object-info (2026-06-08) 12 commits
- cat-file: make remote-object-info allow-list dynamic
- cat-file: validate remote atoms with allow_list
- cat-file: add remote-object-info to batch-command
- transport: add client support for object-info
- serve: advertise object-info feature
- fetch-pack: move fetch initialization
- connect: refactor packet writing
- fetch-pack: move function to connect.c
- t1006: split test utility functions into new "lib-cat-file.sh"
- cat-file: add declaration of variable i inside its for loop
- git-compat-util: add strtoul_ul() with error handling
- transport-helper: fix memory leak of helper on disconnect

The remote-object-info command has been added to git cat-file --batch-command, allowing clients to request object metadata (currently size) from a remote server via protocol v2 without downloading the entire object.

The client dynamically filters format placeholders based on server-advertised capabilities and safely returns empty strings for inapplicable or unsupported fields.

Comments?
source: <[email protected]>

--------------------------------------------------
[Stalled]

* jd/unpack-trees-wo-the-repository (2026-03-31) 2 commits
- unpack-trees: use repository from index instead of global
- unpack-trees: use repository from index instead of global

A handful of inappropriate uses of the_repository have been rewritten to use the right repository structure instance in the unpack-trees.c codepath.

Waiting for response(s) to review comment(s) for too long, consider discarding. cf. <[email protected]>
source: <[email protected]>

* cs/subtree-split-recursion (2026-03-05) 3 commits
- contrib/subtree: reduce recursion during split
- contrib/subtree: functionalize split traversal
- contrib/subtree: reduce function side-effects

When processing large history graphs on Debian or Ubuntu, "git subtree" can die with a "recursion depth reached" error.

Waiting for response(s) to review comment(s) for too long, consider discarding. cf. <[email protected]>
source: <20260305-cs-subtree-split-recursion-v2-0-7266be870ba9@howdoi.land>

--------------------------------------------------
[Cooking]

* ap/http-redirect-wwwauth-fix (2026-06-02) 1 commit
- http: preserve wwwauth_headers across redirects

When cURL follows a redirect, the WWW-Authenticate headers from the redirect target were lost because credential_from_url() cleared the credential state. This has been fixed by preserving the collected headers across the redirect update.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* ps/doc-recommend-b4 (2026-06-07) 3 commits
- b4: introduce configuration for the Git project
- MyFirstContribution: recommend the use of b4
- MyFirstContribution: recommend shallow threading of cover letters

Project-specific configuration for b4 has been introduced, and the documentation has been updated to recommend using it as a streamlined method for submitting patches.

Comments?
source: <[email protected]>

* kk/streaming-walk-pqueue (2026-05-27) 3 commits
- revision: use priority queue for non-limited streaming walks
- revision: introduce rev_walk_mode to clarify get_revision_1()
- pack-objects: call release_revisions() after cruft traversal

Streaming revision walks have been optimized by using a priority queue for date-sorting commits, speeding up walks repositories with many merges.

Will merge to 'next'?
source: <[email protected]>

* kk/wildmatch-windows-ls-files-prereq (2026-05-28) 1 commit (merged to 'next' on 2026-06-04 at 6dc748aa63)
+ t3070: skip ls-files tests with backslash patterns on Windows

In t3070-wildmatch, "via ls-files" test variants with patterns containing backslash escapes are now skipped on Windows, avoiding 36 test failures caused by pathspec separator conversion.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* sn/rebase-update-refs-symrefs (2026-06-03) 1 commit
- rebase: skip branch symref aliases

"git rebase --update-refs" has been taught to resolve local branch symrefs to their referents before queuing updates. This correctly skips aliases of the current branch and avoids duplicate updates for underlying real branches, fixing failures when branch aliases (like a default branch rename) are present.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* lp/http-fetch-pack-index-leak-fix (2026-06-01) 2 commits (merged to 'next' on 2026-06-04 at f4090b5068)
+ http: fix memory leak in fetch_and_setup_pack_index()
+ http: cleanup function fetch_and_setup_pack_index()

A memory leak in fetch_and_setup_pack_index() when verification of the downloaded pack index fails has been plugged. Also an obsolete unlink() call on parse failure has been cleaned up.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* jk/describe-contains-all-match-fix (2026-06-01) 1 commit
- describe: fix --exclude, --match with --contains and --all

The 'git describe --contains --all' command has been fixed to properly honor the '--match' and '--exclude' options by passing them down to 'git name-rev' with the appropriate reference prefixes.

Will merge to 'next'?
source: <[email protected]>

* wy/docs-typofixes (2026-05-29) 1 commit
- docs: fix typos and grammar

Various typos, grammatical errors, and duplicated words in both documentation and code comments have been corrected.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <7b502e20e9495cd4720496bd6738a1fbeb453410.1780041658.git.wy@wyuan.org>

* ab/index-pack-retain-child-bases (2026-06-02) 1 commit
- index-pack: retain child bases in delta cache

"git index-pack" has been optimized by retaining child bases in the delta cache instead of immediately freeing them, letting the existing cache limit policy decide eviction.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* hn/macos-linker-warning (2026-06-02) 1 commit (merged to 'next' on 2026-06-04 at db2ca164c4)
+ config.mak.uname: avoid macOS linker warning on Xcode 16.3+

A linker warning on macOS when building with Xcode 16.3 or newer has been avoided by passing -fno-common to the compiler when a sufficiently new linker is detected.

Will merge to 'master'.
source: <[email protected]>

* mm/diff-process-hunks (2026-05-29) 6 commits
. blame: consult diff process for no-hunk detection
. diff: bypass diff process with --no-ext-diff and in format-patch . diff: add long-running diff process via diff.<driver>.process . sub-process: separate process lifecycle from hashmap management . userdiff: add diff.<driver>.process config
. xdiff: support external hunks via xpparam_t

A new diff.<driver>.process configuration has been introduced to allow a long-running external process to act as a hunk provider to allows external tools to control which lines Git considers changed while leaving all output formatting (word diff, color, blame, etc.) to Git's standard pipeline.

Expecting a reroll.
cf. <CAC2QwmKNA6wv-jG07fgJj7Xj2J+dzzWEiqV5Q+8HJpjA_GtkFw@mail.gmail.com>
source: <[email protected]>

* tb/pack-path-walk-bitmap-delta-islands (2026-06-02) 5 commits
- pack-objects: support --delta-islands with --path-walk
- pack-objects: extract record_tree_depth() helper
- pack-objects: support reachability bitmaps with --path-walk
- t/perf: drop p5311's lookup-table permutation
- Merge branch 'ds/path-walk-filters' into tb/pack-path-walk-bitmap-delta-islands

The pack-objects command now supports using reachability bitmaps and delta-islands concurrently with the --path-walk option, allowing faster packaging by falling back to path-walk when bitmaps cannot fully satisfy the request.

Comments?
source: <[email protected]>

* ty/migrate-trust-executable-bit (2026-05-30) 4 commits
- read-cache: pass 'istate' to stat/mode helper functions
- environment: move 'trust_executable_bit' into repo_config_values
- read-cache: move 'ce_mode_from_stat()' to 'read-cache.c'
- read-cache: remove redundant extern declarations

The 'trust_executable_bit' (coming from 'core.filemode' configuration) has been migrated into 'repo_config_values' to tie it to a specific repository instance.

Waiting for response(s) to review comment(s).
cf. <CAP8UFD1GJ=caPh-M97KLCfB1ZKtpomzosYN0uYBOnay+G23GcA@mail.gmail.com> cf. <CAP8UFD20yij=1ZEYnR74DoCJ3g=b39yOsUxZecYuuf7nFGaKyA@mail.gmail.com>
source: <[email protected]>

* ak/typofixes (2026-05-31) 1 commit
- doc: fix typos via codespell

Typofixes.

Will merge to 'next'.
cf. <[email protected]> cf. <[email protected]>
source: <[email protected]>
source: <[email protected]>
source: <[email protected]>

* kk/prio-queue-cascade-sift (2026-06-01) 1 commit
- prio-queue: use cascade-down for faster extract-min

prio_queue_get() has been optimized by using a cascade-down approach (promoting the smaller child at each level and sifting up the last element from the leaf vacancy), which halves the number of comparisons per extract-min operation in the common case.

Expecting a reroll.
cf. <CAL71e4Ob-B5MJ5DPY+_tzpj6nyrbQ5WutxED2T93SWJV6kJGPA@mail.gmail.com>
source: <[email protected]>

* mm/subprocess-handshake-fix (2026-06-01) 1 commit
- sub-process: use gentle handshake to avoid die() on startup failure

The subprocess handshake during startup has been made gentler by using packet_read_line_gently() instead of packet_read_line() to prevent the parent Git process from dying abruptly when a configured subprocess (e.g., a clean/smudge filter) fails to start.

Will merge to 'next'?
source: <[email protected]>

* jk/repo-info-path-keys (2026-06-05) 4 commits
- repo: add path.commondir with absolute and relative suffix formatting
- repo: add path.gitdir with absolute and relative suffix formatting
- rev-parse: use format_path for path formatting
- path: introduce format_path() for centralized path formatting

The "git repo info" command has been taught new keys to output both absolute and relative paths for "gitdir" and "commondir", supported by a new path-formatting helper extracted from "git rev-parse".

Comments?
source: <[email protected]>

* ps/history-drop (2026-06-08) 9 commits
- builtin/history: implement "drop" subcommand
- builtin/history: split handling of ref updates into two phases
- reset: stop assuming that the caller passes in a clean index
- reset: allow the caller to specify the current HEAD object
- reset: introduce ability to skip reference updates
- reset: introduce dry-run mode
- reset: modernize flags passed to reset_head()
- reset: drop USE_THE_REPOSITORY_VARIABLE
- read-cache: split out function to drop unmerged entries to stage 0

The experimental "git history" command has been taught a new "drop" subcommand to remove a commit and replay its descendants onto its parent.

Comments?
source: <[email protected]>

* ls/doc-raw-timestamp-prefix (2026-06-02) 1 commit
- doc: document and test @ prefix for raw timestamps

Documentation and tests have been added to clarify that Git's internal raw timestamp format requires a @ prefix for values less than 100,000,000 to prevent ambiguity with other formats like YYYYMMDD.

Will merge to 'next'.
cf. [email protected]>
source: <[email protected]>

* jk/setup-gitfile-diag-fix (2026-06-01) 1 commit
- read_gitfile_gently(): return non-repo path on error

A regression in the error diagnosis code for invalid .git files has been fixed, avoiding a potential NULL-pointer crash when reporting that a .git file does not point to a valid repository.

Expecting a reroll?
cf. <[email protected]>
source: <[email protected]>

* jc/submitting-patches-cover-letter (2026-06-02) 2 commits
- SubmittingPatches: describe cover letter
- SubmittingPatches: separate typofixes section

Guidelines on how to write a cover letter for a multi-patch series have been added to SubmittingPatches, which also got a new marker to separate the section for typofixes.

Will merge to 'next'.
cf. <[email protected]> cf. <[email protected]>
source: <[email protected]>

* ps/t7527-fix-tap-output (2026-06-04) 8 commits
- t: let prove fail when parsing invalid TAP output
- t/lib-git-p4: silence output when killing p4d and its watchdog
- t/test-lib: silence EBUSY errors on Windows during test cleanup
- t7810: turn MB_REGEX check into a lazy prereq
- t7527: fix broken TAP output
- ci: unify Linux images across GitLab and GitHub
- gitlab-ci: add missing Linux jobs
- gitlab-ci: rearrange Linux jobs to match GitHub's order

A recent regression in t7527 that broke TAP output has been fixed, some other test noise that also broke TAP output has been silenced, and 'prove' is now configured to fail on invalid TAP output to prevent future regressions.

Comments?
source: <[email protected]>

* ob/more-repo-config-values (2026-06-02) 8 commits
- environment: move "warn_on_object_refname_ambiguity" into struct repo_config_values
- environment: move "sparse_expect_files_outside_of_patterns" into struct repo_config_values
- environment: move "core_sparse_checkout_cone" into struct repo_config_values
- environment: move "precomposed_unicode" into struct repo_config_values
- environment: move "pack_compression_level" into struct repo_config_values
- environment: move zlib_compression_level into struct repo_config_values
- environment: move "check_stat" into struct repo_config_values
- environment: move "trust_ctime" into struct repo_config_values

Many core configuration variables have been migrated from global variables into 'repo_config_values' to tie them to a specific repository instance, avoiding cross-repository state leakage.

Will merge to 'next'.
source: <[email protected]>

* kh/doc-trailers (2026-04-13) 9 commits
- doc: interpret-trailers: document comment line treatment
- doc: interpret-trailers: commit to “trailer block” term
- doc: interpret-trailers: add key format example
- doc: interpret-trailers: explain key format
- doc: interpret-trailers: explain the format after the intro
- doc: interpret-trailers: not just for commit messages
- doc: interpret-trailers: use “metadata” in Name as well
- doc: interpret-trailers: replace “lines” with “metadata”
- doc: interpret-trailers: stop fixating on RFC 822

Documentation updates.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* za/completion-hide-dotfiles (2026-05-26) 1 commit
- completion: hide dotfiles for selected path completion

The path completion for commands like git rm and git mv, is being updated to hide dotfiles by default, unless the user explicitly starts the path with a dot, matching standard shell-completion behavior.

Comments?
cf. <[email protected]>
source: <[email protected]>

* ib/doc-push-default-simple (2026-05-25) 1 commit (merged to 'next' on 2026-06-02 at 5c1ff2a769)
+ doc: clarify push.default=simple behavior

The documentation for push.default = simple has been clarified to better explain its behavior, making it clear that it pushes the current branch to a same-named branch on the remote, and detailing the upstream requirements for centralized workflows.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* jc/doc-monitor-ghci (2026-05-24) 1 commit (merged to 'next' on 2026-06-02 at 46fb5fe1c2)
+ SubmittingPatches: proactively monitor GHCI pages

Encourage original authors to monitor the CI status.

Will merge to 'master'.
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

The -m/-F/-c/-C options to supply commit log message from outside the editor are now supported for all "git commit --fixup" variations.

Comments?
source: <[email protected]>

* gh/jump-auto-mode (2026-05-21) 1 commit
(merged to 'next' on 2026-06-02 at f70dd05c9c)
+ git-jump: pick a mode automatically when invoked without arguments

The 'git-jump' command (in contrib/) has been taught to automatically pick a mode (merge, diff, or ws) when invoked without arguments.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* ps/odb-source-loose (2026-06-01) 19 commits
(merged to 'next' on 2026-06-04 at 660909ad66)
+ odb/source-loose: drop pointer to the "files" source
+ odb/source-loose: stub out remaining callbacks
+ odb/source-loose: wire up write_object_stream() callback
+ object-file: refactor writing objects to use loose source
+ odb/source-loose: wire up write_object() callback
+ loose: refactor object map to operate on struct odb_source_loose
+ odb/source-loose: wire up freshen_object() callback
+ odb/source-loose: drop odb_source_loose_has_object()
+ odb/source-loose: wire up count_objects() callback
+ odb/source-loose: wire up find_abbrev_len() callback
+ odb/source-loose: wire up for_each_object() callback
+ odb/source-loose: wire up read_object_stream() callback
+ odb/source-loose: wire up read_object_info() callback
+ odb/source-loose: wire up close() callback
+ odb/source-loose: wire up reprepare() callback
+ odb/source-loose: start converting to a proper struct odb_source
+ odb/source-loose: store pointer to "files" instead of generic source
+ odb/source-loose: move loose source into "odb/" subsystem
+ Merge branch 'ps/odb-in-memory' into ps/odb-source-loose (this branch is used by ps/odb-source-packed.)

The loose object source has been refactored into a proper struct odb_source.

Will merge to 'master'.
source: <[email protected]>

* ps/setup-centralize-odb-creation (2026-06-04) 9 commits
- setup: construct object database in apply_repository_format()
- repository: stop reading loose object map twice on repo init
- setup: stop initializing object database without repository
- setup: stop creating the object database in setup_git_env()
- repository: stop initializing the object database in repo_set_gitdir()
- setup: deduplicate logic to apply repository format
- setup: drop setup_git_env()
- t0001: plug test gaps for git-init(1) with GIT_OBJECT_DIRECTORY
- Merge branch 'ps/setup-wo-the-repository' into ps/setup-centralize-odb-creation

The setup logic to discover and configure repositories has been refactored, and the initialization of the object database has been centralized.

Will merge to 'next'.
cf. <CAOLa=ZQwVbLsOcajaxQwtkTPm=4St7EiGEEyL6_B0o3Tt1v1pw@mail.gmail.com>
source: <20260604-b4-pks-setup-centralize-odb-creation-v3-0-0691834f318a@pks.im>

* kh/doc-replay-config (2026-06-05) 4 commits
- 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)

Doc update for "git replay" to actually refer to its configuration variables.

Comments?
source: <[email protected]>

* tb/bitmap-build-performance (2026-05-27) 9 commits
(merged to 'next' on 2026-06-02 at d1a84a996a)
+ pack-bitmap: build pseudo-merge bitmaps after regular bitmaps
+ pack-bitmap: remember pseudo-merge parents
+ pack-bitmap: sort bitmaps before XORing
+ pack-bitmap: cache object positions during fill
+ pack-bitmap: consolidate find_object_pos() success path
+ pack-bitmap: reuse stored selected bitmaps
+ pack-bitmap: check subtree bits before recursing
+ pack-bitmap: pass object position to fill_bitmap_tree()
+ Merge branch 'tb/pseudo-merge-bugfixes' into tb/bitmap-build-performance

Reachability bitmap generation has been significantly optimized. By reordering tree traversal, caching object positions, and refining how pseudo-merge bitmaps are constructed, the performance of "git repack --write-midx-bitmaps" is improved, especially for large repositories and when using pseudo-merges.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* hn/status-pull-advice-qualified (2026-05-21) 1 commit
- remote: qualify "git pull" advice for non-upstream compareBranches

Advice shown by "git status" when the local branch is behind or has diverged from its push branch has been updated to suggest "git pull <remote> <branch>".

Comments?
source: <[email protected]>

* rs/strbuf-add-uint (2026-05-12) 4 commits
(merged to 'next' on 2026-06-02 at f5be02d8ec)
+ ls-tree: use strbuf_add_uint()
+ ls-files: use strbuf_add_uint()
+ cat-file: use strbuf_add_uint()
+ strbuf: add strbuf_add_uint()

Adding a decimal integer with strbuf_addf("%u") appears commonly; they have been optimized by using a custom formatter.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* mm/doc-word-diff (2026-05-28) 1 commit
(merged to 'next' on 2026-06-04 at 9fa723ec63)
+ doc: clarify that --word-diff operates on line-level hunks

The documentation for "--word-diff" has been extended with a bit of implementation detail of where these different words come from.

Will merge to 'master'.
source: <[email protected]>

* rs/strbuf-add-oid-hex (2026-05-13) 1 commit
(merged to 'next' on 2026-06-02 at 4876f95de0)
+ hex: add and use strbuf_add_oid_hex()

Formatting object name in full hexadecimal form has been optimized by using a new strbuf_add_oid_hex() helper function.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* hn/config-typo-advice (2026-06-02) 2 commits
- config: improve diagnostic for "set" with missing value
- config: add git_config_key_is_valid() for quiet validation

"git config foo.bar=baz" is not likely to be a request to read the value of such a variable with '=' in its name; rather it is plausible that the user meant "git config set foo.bar baz". Give advice when giving an error message.

Will merge to 'next'.
cf. <[email protected]>
source: <[email protected]>

* jt/config-lock-timeout (2026-05-17) 1 commit
- config: retry acquiring config.lock, configurable via core.configLockTimeout

Configuration file locking now retries for a short period, avoiding failures when multiple processes attempt to update the configuration simultaneously.

Waiting for response(s) to review comment(s). cf. <[email protected]>
source: <[email protected]>

* hn/branch-prune-merged (2026-06-05) 6 commits
. branch: add --dry-run for --prune-merged
. branch: add branch.<name>.pruneMerged opt-out
. branch: add --prune-merged <branch>
. branch: prepare delete_branches for a bulk caller
. branch: let delete_branches warn instead of error on bulk refusal . branch: add --forked filter for --list mode

"git branch" command learned "--prune-merged" option to remove local branches that have already been merged to the remote-tracking branches they track.

Breaks tests.
source: <[email protected]>

* st/daemon-sockaddr-fixes (2026-05-27) 3 commits (merged to 'next' on 2026-06-04 at 17684e6158)
+ daemon: guard NULL REMOTE_PORT in execute() logging
+ daemon: fix IPv6 address truncation in ip2str()
+ daemon: fix IPv6 address corruption in lookup_hostname()

Correct use of sockaddr API in "git daemon".

Will merge to 'master'.
source: <[email protected]>

* cc/promisor-auto-config-url-more (2026-05-27) 8 commits
- doc: promisor: improve acceptFromServer entry
- promisor-remote: auto-configure unknown remotes
- promisor-remote: trust known remotes matching acceptFromServerUrl
- promisor-remote: introduce promisor.acceptFromServerUrl
- promisor-remote: add 'local_name' to 'struct promisor_info'
- urlmatch: add url_normalize_pattern() helper
- urlmatch: change 'allow_globs' arg to bool
- t5710: simplify 'mkdir X' followed by 'git -C X init'

The handling of promisor-remote protocol capability has been loosened to allow the other side to add to the list of promisor remotes via the promisor.acceptFromServerURL configuration variable.

Comments?
source: <[email protected]>

* hn/checkout-track-fetch (2026-05-23) 2 commits
- checkout: extend --track with a "fetch" mode to refresh start-point
- branch: expose helpers for finding the remote owning a tracking ref

"git checkout --track=..." learned to optionally fetch the branch from the remote the new branch will work with.

Comments?
source: <[email protected]>

* mf/revision-max-count-oldest (2026-05-18) 1 commit
- revision.c: implement --max-count-oldest

"git rev-list" (and "git log" family of commands) learned a new "--max-count-oldest" that picks oldest N commits in the range instead of the usual newest.

Will merge to 'next'.
source: <8210d60832b9a58aa4d71fc3790e44d8989564ce.1779152064.git.mroik@delayed.space>

* mm/line-log-cleanup (2026-05-28) 3 commits
(merged to 'next' on 2026-06-04 at 02f8bea278)
+ line-log: allow non-patch diff formats with -L
+ line-log: integrate -L output with the standard log-tree pipeline
+ revision: move -L setup before output_format-to-diff derivation

The git log -L implementation has been refactored to use the standard diff output pipeline, enabling pickaxe and diff-filter to work as expected. Additionally, metadata-only diff formats like --raw and --name-only are now supported with -L.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* en/ort-harden-against-corrupt-trees (2026-04-20) 5 commits
- cache-tree: fix verify_cache() to catch non-adjacent D/F conflicts
- merge-ort: abort merge when trees have duplicate entries
- merge-ort: free diff pairs queue in clear_or_reinit_internal_opts()
- merge-ort: drop unnecessary show_all_errors from collect_merge_info()
- merge-ort: propagate callback errors from traverse_trees_wrapper()

"ort" merge backend handles merging corrupt trees better by aborting when it should.

Waiting for response(s) to review comment(s). cf. <[email protected]>
source: <[email protected]>

* pw/status-rebase-todo (2026-05-01) 2 commits
- status: improve rebase todo list parsing
- sequencer: factor out parsing of todo commands

The display of the rebase todo list in "git status" has been improved to correctly abbreviate object IDs for more commands and avoid misinterpreting refs as object IDs.

Waiting for response(s) to review comment(s). cf. <[email protected]>
source: <[email protected]>

* cl/conditional-config-on-worktree-path (2026-05-24) 2 commits
- config: add "worktree" and "worktree/i" includeIf conditions
- config: refactor include_by_gitdir() into include_by_path()

The [includeIf "condition"] conditional inclusion facility for configuration files has learned to use the location of worktree in its condition.

Waiting for response(s) to review comment(s).
cf. <[email protected]>
source: <[email protected]>

* ps/shift-root-in-graph (2026-04-27) 1 commit
- graph: add indentation for commits preceded by a parentless commit

In a history with more than one root commit, "git log --graph --oneline" stuffed an unrelated commit immediately below a root commit, which has been corrected by making the spot below a root unavailable.

Expecting a reroll.
cf. <CAN5EUNQoKRqt3FGLmzRGpPU1nO5jCAogP8Wm9gBZXuPbMNbQAw@mail.gmail.com>
source: <[email protected]>

* th/promisor-quiet-per-repo (2026-04-06) 1 commit (merged to 'next' on 2026-06-02 at 02a749d7fe)
+ promisor-remote: fix promisor.quiet to use the correct repository

The "promisor.quiet" configuration variable was not used from relevant submodules when commands like "grep --recurse-submodules" triggered a lazy fetch, which has been corrected.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* ua/push-remote-group (2026-05-03) 3 commits (merged to 'next' on 2026-06-02 at ba5d6aebaa)
+ push: support pushing to a remote group
+ remote: move remote group resolution to remote.c
+ remote: fix sign-compare warnings in push_cas_option

"git push" learned to take a "remote group" name to push to, which causes pushes to multiple places, just like "git fetch" would do.

Will merge to 'master'.
cf. <[email protected]>
source: <[email protected]>

* js/parseopt-subcommand-autocorrection (2026-04-27) 11 commits
- SQUASH???
- doc: document autocorrect API
- parseopt: add tests for subcommand autocorrection
- parseopt: enable subcommand autocorrection for git-remote and git-notes
- parseopt: autocorrect mistyped subcommands
- autocorrect: provide config resolution API
- autocorrect: rename AUTOCORRECT_SHOW to AUTOCORRECT_HINT
- autocorrect: use mode and delay instead of magic numbers
- help: move tty check for autocorrection to autocorrect.c
- help: make autocorrect handling reusable
- parseopt: extract subcommand handling from parse_options_step()

The parse-options library learned to auto-correct misspelled subcommand names.

Expecting a reroll.
cf. <SY0P300MB0801E50FCB7EB2F45CD15208CE042@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>
source: <SY0P300MB0801677A2A1E0FD38D06A841CE2A2@SY0P300MB0801.AUSP300.PROD.OUTLOOK.COM>

* jc/neuter-sideband-post-3.0 (2026-03-05) 2 commits
- sideband: delay sanitizing by default to Git v3.0
- Merge branch 'jc/neuter-sideband-fixup' into jc/neuter-sideband-post-3.0

The final step, split from earlier attempt by Dscho, to loosen the sideband restriction for now and tighten later at Git v3.0 boundary.

On hold to help the base topic with wider exposure. (this branch uses jc/neuter-sideband-fixup.)
source: <[email protected]>

--------------------------------------------------
[Discarded]

* kk/fetch-store-ref-optimization (2026-05-24) 1 commit
- fetch: pass transport to post-fetch connectivity check

When fetching from a transport that provides a self-contained pack, pass the transport pointer to the post-fetch check_connected() call to optimize connectivity check.

Retracted.
cf. <CAL71e4MrVqC1=AR6x0_8S=8kVqPdDkhgCZRb4etFsxTzd6s_8Q@mail.gmail.com>
source: <[email protected]>

* lp/repack-propagate-promisor-debugging-info (2026-04-18) 6 commits
- repack-promisor: add missing headers
- t7703: test for promisor file content after geometric repack
- t7700: test for promisor file content after repack
- repack-promisor: preserve content of promisor files after repack
- repack-promisor add helper to fill promisor file after repack
- pack-write: add explanation to promisor file content

When fetching objects into a lazily cloned repository, .promisor files are created with information meant to help debugging. "git repack" has been taught to carry this information forward to packfiles that are newly created.

Retracted.
cf. <agx_GPfBKpkSc3Gx@lorenzo-VM>
source: <[email protected]>

#1 lore raw

Hi Junio

Quoted 11 lines · Junio C Hamano

* pw/status-rebase-todo (2026-05-01) 2 commits
- status: improve rebase todo list parsing
- sequencer: factor out parsing of todo commands

The display of the rebase todo list in "git status" has been improved to correctly abbreviate object IDs for more commands and avoid misinterpreting refs as object IDs.

Waiting for response(s) to review comment(s).
cf. <[email protected]>

I replied to that message with <[email protected]> I'm waiting to hear whether you agree that the unambiguous label case is unlikely enough to happen that we can ignore it.

Thanks

Phillip

#2 lore raw
Quoted 12 lines · Phillip Wood

Hi Junio

Quoted 9 lines · Junio C Hamano

* pw/status-rebase-todo (2026-05-01) 2 commits
- status: improve rebase todo list parsing
- sequencer: factor out parsing of todo commands

The display of the rebase todo list in "git status" has been improved to correctly abbreviate object IDs for more commands and avoid misinterpreting refs as object IDs.

Quoted 7 lines
Quoted 2 lines

Waiting for response(s) to review comment(s).
cf. <[email protected]>

I replied to that message with <[email protected]> I'm waiting to hear whether you agree that the unambiguous label case is unlikely enough to happen that we can ignore it.

Thanks.

I forgot to send the response to the message, so I just have done so.