git, branch jchMirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=jch2026-04-17T04:27:23ZMerge branch 'th/promisor-quiet-per-repo' into jch2026-04-17T04:27:23ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:23Zurn:sha1:4e88311f426c6bf3572524f88aeaf312ebdd94dd
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.
Comments?
* th/promisor-quiet-per-repo:
promisor-remote: fix promisor.quiet to use the correct repository
Merge branch 'jt/config-lock-timeout' into jch2026-04-17T04:27:22ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:22Zurn:sha1:c2c4c4c7d540a381b974f369fb73faf33e0e8f48
The code path to update the configuration file has been taught to
use a short timeout to retry.
* jt/config-lock-timeout:
config: retry acquiring config.lock for 100ms
Merge branch 'cl/conditional-config-on-worktree-path' into jch2026-04-17T04:27:22ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:22Zurn:sha1:91fd8d6534fcc726c09ea8cd6ca75404e9cb1475
The [includeIf "condition"] conditional inclusion facility for
configuration files has learned to use the location of worktree
in its condition.
Comments?
* cl/conditional-config-on-worktree-path:
config: add "worktree" and "worktree/i" includeIf conditions
config: refactor include_by_gitdir() into include_by_path()
Merge branch 'ds/fetch-negotiation-options' into jch2026-04-17T04:27:22ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:22Zurn:sha1:878809dc2ef29cc38c434c135f3e26cf0eb2509f
The negotiation tip options in "git fetch" have been reworked to
allow requiring certain refs to be sent as "have" lines, and to
restrict negotiation to a specific set of refs.
* ds/fetch-negotiation-options:
send-pack: pass negotiation config in push
remote: add negotiationRequire config as default for --negotiation-require
fetch: add --negotiation-require option for negotiation
remote: add remote.*.negotiationRestrict config
transport: rename negotiation_tips
fetch: add --negotiation-restrict option
t5516: fix test order flakiness
Merge branch 'sa/cat-file-batch-mailmap-switch' into jch2026-04-17T04:27:21ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:21Zurn:sha1:e7d77ec2f3511c4cf63a355ad3016541a070d78d
"git cat-file --batch" learns an in-line command "mailmap"
that lets the user toggle use of mailmap.
* sa/cat-file-batch-mailmap-switch:
cat-file: add mailmap subcommand to --batch-command
Merge branch 'ua/push-remote-group' into jch2026-04-17T04:27:21ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:21Zurn:sha1:b8191b78e29c79fe0938d268c5d4880f442b3627
"git push" learned to take a "remote group" name to push to, which
causes pushes to multiple places, just like "git fetch" would do.
* ua/push-remote-group:
SQUASH??? - futureproof against the attack of the "main"
Merge branch 'ua/push-remote-group' (early part) into jch2026-04-17T04:27:21ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:21Zurn:sha1:23f10a7d30e0e4837c117a6e151e9508c837e7cf
* 'ua/push-remote-group' (early part):
push: support pushing to a remote group
remote: move remote group resolution to remote.c
Merge branch 'js/parseopt-subcommand-autocorrection' into jch2026-04-17T04:27:20ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:20Zurn:sha1:8dd4eed84bfa07d9ecab33ad6825111669775d0d
The parse-options library learned to auto-correct misspelled
subcommand names.
* js/parseopt-subcommand-autocorrection:
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()
Merge branch 'pt/promisor-lazy-fetch-no-recurse' into jch2026-04-17T04:27:20ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:20Zurn:sha1:26056e873fcd64948c2c29e56d857813748ecfdd
The mechanism to avoid recursive lazy-fetch from promisor remotes
was not propagated properly to child "git fetch" processes, which
has been corrected.
* pt/promisor-lazy-fetch-no-recurse:
promisor-remote: prevent lazy-fetch recursion in child fetch
Merge branch 'jd/unpack-trees-wo-the-repository' into jch2026-04-17T04:27:20ZJunio C Hamanogitster@pobox.com2026-04-17T04:27:20Zurn:sha1:dfe931f6f1235df709f25af690caac87d0d405d6
A handful of inappropriate uses of the_repository have been
rewritten to use the right repository structure instance in the
unpack-trees.c codepath.
Comments?
* jd/unpack-trees-wo-the-repository:
unpack-trees: use repository from index instead of global
unpack-trees: use repository from index instead of global