diff options
| author | Olamide Caleb Bello <belkid98@gmail.com> | 2026-02-16 17:38:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-26 07:22:53 -0800 |
| commit | cf50830ce1d1b95a44f9d095ff868e7df1495863 (patch) | |
| tree | cd822cab52c3abbc1685d3c5f3568c5e6dc5ac1e /environment.h | |
| parent | 4021751558126d39b642503e7ef4768131df45e7 (diff) | |
| download | git-cf50830ce1d1b95a44f9d095ff868e7df1495863.tar.xz | |
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>
Diffstat (limited to 'environment.h')
| -rw-r--r-- | environment.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/environment.h b/environment.h index 2e24160322..4bfd798757 100644 --- a/environment.h +++ b/environment.h @@ -2,6 +2,7 @@ #define ENVIRONMENT_H #include "repo-settings.h" +#include "branch.h" /* Double-check local_repo_env below if you add to this list. */ #define GIT_DIR_ENVIRONMENT "GIT_DIR" @@ -89,6 +90,9 @@ struct repo_config_values { /* section "core" config values */ char *attributes_file; int apply_sparse_checkout; + + /* section "branch" config values */ + enum branch_track branch_track; }; struct repo_config_values *repo_config_values(struct repository *repo); |