]> git.ipfire.org Git - thirdparty/git.git/commit
environment: move "branch.autoSetupMerge" into `struct repo_config_values`
authorOlamide Caleb Bello <belkid98@gmail.com>
Mon, 16 Feb 2026 16:38:27 +0000 (17:38 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Feb 2026 15:22:53 +0000 (07:22 -0800)
commitcf50830ce1d1b95a44f9d095ff868e7df1495863
treecd822cab52c3abbc1685d3c5f3568c5e6dc5ac1e
parent4021751558126d39b642503e7ef4768131df45e7
environment: move "branch.autoSetupMerge" into `struct repo_config_values`

The config value `branch.autoSetupMerge` is parsed in
`git_default_branch_config()` and stored in the global variable
`git_branch_track`. This global variable can be overwritten
by another repository when multiple Git repos run in the the same process.

Move this value into `struct repo_config_values` in the_repository to
retain current behaviours and move towards libifying Git.
Since the variable is no longer a global variable, it has been renamed to
`branch_track` in the struct `repo_config_values`.

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