]> git.ipfire.org Git - thirdparty/git.git/commit
environment: move "branch.autoSetupMerge" into `struct repo_config_values`
authorOlamide Caleb Bello <belkid98@gmail.com>
Tue, 13 Jan 2026 16:44:02 +0000 (17:44 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2026 19:14:42 +0000 (11:14 -0800)
commit020ca15a2e00c19e501f18903dfc7cdaf3dca8a9
tree5f93747aef85c0e8810bf6635275f33c477ae3a3
parentdae2d08cad0d2d4022f0f1ba2689b9680b3de95d
environment: move "branch.autoSetupMerge" into `struct repo_config_values`

The config value `brach.autoSetupMerge` is parsed in
`git_default_branch_config()` and stored in the global variable
`git_branch_track`. This global variable can cause unexpected behaviours
when multiple Git repos run in the the same process.

Move this value into `struct repo_config_values` which holds all values
parsed by `git_default_config()` and can be accessed per
repo via `git_default_config()`. This would retain the same
behaviours while achieving repository scoped access.

Suggested-by: Phillip Wood <phillip.wood123@gmail.com>
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Olamide Caleb Bello <belkid98@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
branch.h
builtin/branch.c
builtin/checkout.c
builtin/push.c
builtin/submodule--helper.c
environment.c
environment.h
repository.c