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>

diff --git a/branch.h b/branch.h
index ec2f35fda449aa365c424aad6ce05907b57d52a5..3dc6e2a0ffe6359eecd9ca169ff4483e8880a256 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -15,8 +15,6 @@ enum branch_track {
        BRANCH_TRACK_SIMPLE,
 };
 
-extern enum branch_track git_branch_track;
-
 /* Functions for acting on the information about branches. */
 
 /**

diff --git a/builtin/branch.c b/builtin/branch.c
index c577b5d20f296911abe04be6d935cce7221b0282..a1a43380d0640bd05afd2bc5e8e0f5526c9d013e 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -724,6 +724,7 @@ int cmd_branch(int argc,
        static struct ref_sorting *sorting;
        struct string_list sorting_options = STRING_LIST_INIT_DUP;
        struct ref_format format = REF_FORMAT_INIT;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
        int ret;
 
        struct option options[] = {
@@ -795,7 +796,7 @@ int cmd_branch(int argc,
        if (!sorting_options.nr)
                string_list_append(&sorting_options, "refname");
 
-       track = git_branch_track;
+       track = cfg->branch_track;
 
        head = refs_resolve_refdup(get_main_ref_store(the_repository), "HEAD",
                                   0, &head_oid, NULL);

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 66b69df6e67234a5c67525abd4c432490ba561e9..736e20f8085c4f38eb081d2983590e3b0ce234ca 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1588,6 +1588,7 @@ static void die_if_switching_to_a_branch_in_use(struct checkout_opts *opts,
 static int checkout_branch(struct checkout_opts *opts,
                           struct branch_info *new_branch_info)
 {
+       struct repo_config_values *cfg = repo_config_values(the_repository);
        int noop_switch = (!new_branch_info->name &&
                           !opts->new_branch &&
                           !opts->force_detach);
@@ -1631,7 +1632,7 @@ static int checkout_branch(struct checkout_opts *opts,
                if (opts->track != BRANCH_TRACK_UNSPECIFIED)
                        die(_("'%s' cannot be used with '%s'"), "--detach", "-t");
        } else if (opts->track == BRANCH_TRACK_UNSPECIFIED)
-               opts->track = git_branch_track;
+               opts->track = cfg->branch_track;
 
        if (new_branch_info->name && !new_branch_info->commit)
                die(_("Cannot switch branch to a non-commit '%s'"),

diff --git a/builtin/push.c b/builtin/push.c
index 5b6cebbb856cfc569079ad70f6825c76ea8e3cba..7100ffba5da17ee49b2e6c07ff58e3edf3be1850 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -151,6 +151,7 @@ static NORETURN void die_push_simple(struct branch *branch,
        const char *advice_pushdefault_maybe = "";
        const char *advice_automergesimple_maybe = "";
        const char *short_upstream = branch->merge[0]->src;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        skip_prefix(short_upstream, "refs/heads/", &short_upstream);
 
@@ -162,7 +163,7 @@ static NORETURN void die_push_simple(struct branch *branch,
                advice_pushdefault_maybe = _("\n"
                                 "To choose either option permanently, "
                                 "see push.default in 'git help config'.\n");
-       if (git_branch_track != BRANCH_TRACK_SIMPLE)
+       if (cfg->branch_track != BRANCH_TRACK_SIMPLE)
                advice_automergesimple_maybe = _("\n"
                                 "To avoid automatically configuring "
                                 "an upstream branch when its name\n"

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index d537ab087a02e92916da62fd9360e64921a18f40..594cd107b34b84b957cce1890d285bebd553bebc 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -3126,9 +3126,10 @@ static int module_create_branch(int argc, const char **argv, const char *prefix,
                N_("git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>"),
                NULL
        };
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        repo_config(the_repository, git_default_config, NULL);
-       track = git_branch_track;
+       track = cfg->branch_track;
        argc = parse_options(argc, argv, prefix, options, usage, 0);
 
        if (argc != 3)

diff --git a/environment.c b/environment.c
index 390af1ce54c093ac8210ca98f582bb1f25c96f6c..1bc3adb75bac20bbdce7309197575a8337f2d919 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -66,7 +66,6 @@ enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
 enum eol core_eol = EOL_UNSET;
 int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN;
 char *check_roundtrip_encoding;
-enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
 enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
 #ifndef OBJECT_CREATION_MODE
@@ -607,18 +606,20 @@ static int git_default_i18n_config(const char *var, const char *value)
 
 static int git_default_branch_config(const char *var, const char *value)
 {
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
        if (!strcmp(var, "branch.autosetupmerge")) {
                if (value && !strcmp(value, "always")) {
-                       git_branch_track = BRANCH_TRACK_ALWAYS;
+                       cfg->branch_track = BRANCH_TRACK_ALWAYS;
                        return 0;
                } else if (value && !strcmp(value, "inherit")) {
-                       git_branch_track = BRANCH_TRACK_INHERIT;
+                       cfg->branch_track = BRANCH_TRACK_INHERIT;
                        return 0;
                } else if (value && !strcmp(value, "simple")) {
-                       git_branch_track = BRANCH_TRACK_SIMPLE;
+                       cfg->branch_track = BRANCH_TRACK_SIMPLE;
                        return 0;
                }
-               git_branch_track = git_config_bool(var, value);
+               cfg->branch_track = git_config_bool(var, value);
                return 0;
        }
        if (!strcmp(var, "branch.autosetuprebase")) {
@@ -761,4 +762,5 @@ void repo_config_values_init(struct repo_config_values *cfg)
 {
        cfg->attributes_file = NULL;
        cfg->apply_sparse_checkout = 0;
+       cfg->branch_track = BRANCH_TRACK_REMOTE;
 }

diff --git a/environment.h b/environment.h
index 2e24160322451a6078e69c1a674a8fcd136e9fbb..4bfd79875728eebbabac29ab936012d916a987ed 100644 (file)
--- 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);