environment: stop using core.sparseCheckout globally

The config value `core.sparseCheckout` is parsed in
`git_default_core_config()` and stored globally in
`core_apply_sparse_checkout`. This could cause it to be overwritten
by another repository when different Git repositories run in the same
process.

Move the parsed value into `struct repo_config_values` in the_repository
to retain current behaviours and move towards libifying Git.

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/builtin/backfill.c b/builtin/backfill.c
index e80fc1b694df616115ac4b6a538ed22a4e7a772b..9b2ca57b6adec8042f4d7eb5903511e69c1e9290 100644 (file)
--- a/builtin/backfill.c
+++ b/builtin/backfill.c
@@ -129,6 +129,7 @@ int cmd_backfill(int argc, const char **argv, const char *prefix, struct reposit
                         N_("Restrict the missing objects to the current sparse-checkout")),
                OPT_END(),
        };
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        show_usage_with_options_if_asked(argc, argv,
                                         builtin_backfill_usage, options);
@@ -139,7 +140,7 @@ int cmd_backfill(int argc, const char **argv, const char *prefix, struct reposit
        repo_config(repo, git_default_config, NULL);
 
        if (ctx.sparse < 0)
-               ctx.sparse = core_apply_sparse_checkout;
+               ctx.sparse = cfg->apply_sparse_checkout;
 
        result = do_backfill(&ctx);
        backfill_context_clear(&ctx);

diff --git a/builtin/clone.c b/builtin/clone.c
index b19b302b06546710b7c8bc20b696a0944c9f1b78..9ba08b86ae8e23f4137fe1c760245eeda5c84931 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -617,13 +617,15 @@ static int git_sparse_checkout_init(const char *repo)
 {
        struct child_process cmd = CHILD_PROCESS_INIT;
        int result = 0;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
        strvec_pushl(&cmd.args, "-C", repo, "sparse-checkout", "set", NULL);
 
        /*
         * We must apply the setting in the current process
         * for the later checkout to use the sparse-checkout file.
         */
-       core_apply_sparse_checkout = 1;
+       cfg->apply_sparse_checkout = 1;
 
        cmd.git_cmd = 1;
        if (run_command(&cmd)) {

diff --git a/builtin/grep.c b/builtin/grep.c
index 53cccf2d25068c664c27643873b8c6d7fe99d848..207d34054825db40e31681b9210a87566971ca2f 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -482,7 +482,7 @@ static int grep_submodule(struct grep_opt *opt,
         *      "forget" the sparse-index feature switch. As a result, the index
         *      of these submodules are expanded unexpectedly.
         *
-        * 2. "core_apply_sparse_checkout"
+        * 2. "config_values_private_.apply_sparse_checkout"
         *      When running `grep` in the superproject, this setting is
         *      populated using the superproject's configs. However, once
         *      initialized, this config is globally accessible and is read by

diff --git a/builtin/mv.c b/builtin/mv.c
index d43925097b420f0eb03941a20086be0c9a5b4094..2215d34e31f29af260b0d9743778604dda6e0620 100644 (file)
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -238,6 +238,7 @@ int cmd_mv(int argc,
        struct hashmap moved_dirs = HASHMAP_INIT(pathmap_cmp, NULL);
        struct strbuf pathbuf = STRBUF_INIT;
        int ret;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        repo_config(the_repository, git_default_config, NULL);
 
@@ -572,7 +573,7 @@ remove_entry:
                rename_index_entry_at(the_repository->index, pos, dst);
 
                if (ignore_sparse &&
-                   core_apply_sparse_checkout &&
+                   cfg->apply_sparse_checkout &&
                    core_sparse_checkout_cone) {
                        /*
                         * NEEDSWORK: we are *not* paying attention to

diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 15d51e60a865331c63be35523507a315646603aa..7f3317841ef94316215fccec12b7e3928ef4928d 100644 (file)
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -61,9 +61,10 @@ static int sparse_checkout_list(int argc, const char **argv, const char *prefix,
        struct pattern_list pl;
        char *sparse_filename;
        int res;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        setup_work_tree();
-       if (!core_apply_sparse_checkout)
+       if (!cfg->apply_sparse_checkout)
                die(_("this worktree is not sparse"));
 
        argc = parse_options(argc, argv, prefix,
@@ -399,12 +400,14 @@ static int set_config(struct repository *repo,
 }
 
 static enum sparse_checkout_mode update_cone_mode(int *cone_mode) {
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
        /* If not specified, use previous definition of cone mode */
-       if (*cone_mode == -1 && core_apply_sparse_checkout)
+       if (*cone_mode == -1 && cfg->apply_sparse_checkout)
                *cone_mode = core_sparse_checkout_cone;
 
        /* Set cone/non-cone mode appropriately */
-       core_apply_sparse_checkout = 1;
+       cfg->apply_sparse_checkout = 1;
        if (*cone_mode == 1 || *cone_mode == -1) {
                core_sparse_checkout_cone = 1;
                return MODE_CONE_PATTERNS;
@@ -416,9 +419,10 @@ static enum sparse_checkout_mode update_cone_mode(int *cone_mode) {
 static int update_modes(struct repository *repo, int *cone_mode, int *sparse_index)
 {
        int mode, record_mode;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        /* Determine if we need to record the mode; ensure sparse checkout on */
-       record_mode = (*cone_mode != -1) || !core_apply_sparse_checkout;
+       record_mode = (*cone_mode != -1) || !cfg->apply_sparse_checkout;
 
        mode = update_cone_mode(cone_mode);
        if (record_mode && set_config(repo, mode))
@@ -684,6 +688,7 @@ static int modify_pattern_list(struct repository *repo,
        int result;
        int changed_config = 0;
        struct pattern_list *pl = xcalloc(1, sizeof(*pl));
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        switch (m) {
        case ADD:
@@ -699,9 +704,9 @@ static int modify_pattern_list(struct repository *repo,
                break;
        }
 
-       if (!core_apply_sparse_checkout) {
+       if (!cfg->apply_sparse_checkout) {
                set_config(repo, MODE_ALL_PATTERNS);
-               core_apply_sparse_checkout = 1;
+               cfg->apply_sparse_checkout = 1;
                changed_config = 1;
        }
 
@@ -796,9 +801,10 @@ static int sparse_checkout_add(int argc, const char **argv, const char *prefix,
        };
        struct strvec patterns = STRVEC_INIT;
        int ret;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        setup_work_tree();
-       if (!core_apply_sparse_checkout)
+       if (!cfg->apply_sparse_checkout)
                die(_("no sparse-checkout to add to"));
 
        repo_read_index(repo);
@@ -905,9 +911,10 @@ static int sparse_checkout_reapply(int argc, const char **argv,
                         N_("toggle the use of a sparse index")),
                OPT_END(),
        };
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        setup_work_tree();
-       if (!core_apply_sparse_checkout)
+       if (!cfg->apply_sparse_checkout)
                die(_("must be in a sparse-checkout to reapply sparsity patterns"));
 
        reapply_opts.cone_mode = -1;
@@ -960,6 +967,7 @@ static int sparse_checkout_clean(int argc, const char **argv,
        size_t worktree_len;
        int force = 0, dry_run = 0, verbose = 0;
        int require_force = 1;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        struct option builtin_sparse_checkout_clean_options[] = {
                OPT__DRY_RUN(&dry_run, N_("dry run")),
@@ -969,7 +977,7 @@ static int sparse_checkout_clean(int argc, const char **argv,
        };
 
        setup_work_tree();
-       if (!core_apply_sparse_checkout)
+       if (!cfg->apply_sparse_checkout)
                die(_("must be in a sparse-checkout to clean directories"));
        if (!core_sparse_checkout_cone)
                die(_("must be in a cone-mode sparse-checkout to clean directories"));
@@ -1033,9 +1041,10 @@ static int sparse_checkout_disable(int argc, const char **argv,
                OPT_END(),
        };
        struct pattern_list pl;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        /*
-        * We do not exit early if !core_apply_sparse_checkout; due to the
+        * We do not exit early if !repo->config_values.apply_sparse_checkout; due to the
         * ability for users to manually muck things up between
         *   direct editing of .git/info/sparse-checkout
         *   running read-tree -m u HEAD or update-index --skip-worktree
@@ -1061,7 +1070,7 @@ static int sparse_checkout_disable(int argc, const char **argv,
        hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0);
        hashmap_init(&pl.parent_hashmap, pl_hashmap_cmp, NULL, 0);
        pl.use_cone_patterns = 0;
-       core_apply_sparse_checkout = 1;
+       cfg->apply_sparse_checkout = 1;
 
        add_pattern("/*", empty_base, 0, &pl, 0);
 

diff --git a/builtin/worktree.c b/builtin/worktree.c
index fbdaf2eb2eb85ce33e2001dfa5030fca9ddaeaf4..90e56ab49594ac345a2e35cf99188b8542a29b26 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -440,6 +440,7 @@ static int add_worktree(const char *path, const char *refname,
        struct strbuf sb_name = STRBUF_INIT;
        struct worktree **worktrees, *wt = NULL;
        struct ref_store *wt_refs;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        worktrees = get_worktrees();
        check_candidate_path(path, opts->force, worktrees, "add");
@@ -536,7 +537,7 @@ static int add_worktree(const char *path, const char *refname,
         * If the current worktree has sparse-checkout enabled, then copy
         * the sparse-checkout patterns from the current worktree.
         */
-       if (core_apply_sparse_checkout)
+       if (cfg->apply_sparse_checkout)
                copy_sparse_checkout(sb_repo.buf);
 
        /*

diff --git a/dir.c b/dir.c
index b00821f294fea2fdd74a41d7e82a6b5aaa62a66c..026d8516a912af29f27494e47c080a899328eefc 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -1551,7 +1551,9 @@ done:
 
 int init_sparse_checkout_patterns(struct index_state *istate)
 {
-       if (!core_apply_sparse_checkout)
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
+       if (!cfg->apply_sparse_checkout)
                return 1;
        if (istate->sparse_checkout_patterns)
                return 0;

diff --git a/environment.c b/environment.c
index 4b5c701e8070f8d482390017bc4f3534b2643550..390af1ce54c093ac8210ca98f582bb1f25c96f6c 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -74,7 +74,6 @@ enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
 #endif
 enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 int grafts_keep_true_parents;
-int core_apply_sparse_checkout;
 int core_sparse_checkout_cone;
 int sparse_expect_files_outside_of_patterns;
 int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
@@ -546,7 +545,7 @@ static int git_default_core_config(const char *var, const char *value,
        }
 
        if (!strcmp(var, "core.sparsecheckout")) {
-               core_apply_sparse_checkout = git_config_bool(var, value);
+               cfg->apply_sparse_checkout = git_config_bool(var, value);
                return 0;
        }
 
@@ -761,4 +760,5 @@ int git_default_config(const char *var, const char *value,
 void repo_config_values_init(struct repo_config_values *cfg)
 {
        cfg->attributes_file = NULL;
+       cfg->apply_sparse_checkout = 0;
 }

diff --git a/environment.h b/environment.h
index dfc31b794de54394fc543d6fba64d0cceead6b23..2e24160322451a6078e69c1a674a8fcd136e9fbb 100644 (file)
--- a/environment.h
+++ b/environment.h
@@ -88,6 +88,7 @@ struct repository;
 struct repo_config_values {
        /* section "core" config values */
        char *attributes_file;
+       int apply_sparse_checkout;
 };
 
 struct repo_config_values *repo_config_values(struct repository *repo);
@@ -171,7 +172,6 @@ extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
 
-extern int core_apply_sparse_checkout;
 extern int core_sparse_checkout_cone;
 extern int sparse_expect_files_outside_of_patterns;
 

diff --git a/sparse-index.c b/sparse-index.c
index 76f90da5f5f41e2ddfdb9d784614078b29e740e8..13629c075d06e04cdeea1bc36459f61810b80b16 100644 (file)
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -152,7 +152,9 @@ static int index_has_unmerged_entries(struct index_state *istate)
 
 int is_sparse_index_allowed(struct index_state *istate, int flags)
 {
-       if (!core_apply_sparse_checkout || !core_sparse_checkout_cone)
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
+       if (!cfg->apply_sparse_checkout || !core_sparse_checkout_cone)
                return 0;
 
        if (!(flags & SPARSE_INDEX_MEMORY_ONLY)) {
@@ -670,7 +672,9 @@ static void clear_skip_worktree_from_present_files_full(struct index_state *ista
 
 void clear_skip_worktree_from_present_files(struct index_state *istate)
 {
-       if (!core_apply_sparse_checkout ||
+       struct repo_config_values *cfg = repo_config_values(the_repository);
+
+       if (!cfg->apply_sparse_checkout ||
            sparse_expect_files_outside_of_patterns)
                return;
 

diff --git a/unpack-trees.c b/unpack-trees.c
index f38c761ab987a6647ffd414253c81e608d9c67a7..998a1e6dc70cae48a700651459ba87b8151a765a 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1888,6 +1888,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        struct pattern_list pl;
        int free_pattern_list = 0;
        struct dir_struct dir = DIR_INIT;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
        if (o->reset == UNPACK_RESET_INVALID)
                BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
@@ -1924,7 +1925,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        if (o->prefix)
                update_sparsity_for_prefix(o->prefix, o->src_index);
 
-       if (!core_apply_sparse_checkout || !o->update)
+       if (!cfg->apply_sparse_checkout || !o->update)
                o->skip_sparse_checkout = 1;
        if (!o->skip_sparse_checkout) {
                memset(&pl, 0, sizeof(pl));

diff --git a/wt-status.c b/wt-status.c
index e12adb26b9f8eb19ba7cf03537da4982b53f7a09..6609b37cadb2131a53e61bc2c855815dcfd93de7 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1763,8 +1763,10 @@ static void wt_status_check_sparse_checkout(struct repository *r,
 {
        int skip_worktree = 0;
        int i;
+       struct repo_config_values *cfg = repo_config_values(the_repository);
 
-       if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
+       if (!cfg->apply_sparse_checkout ||
+           r->index->cache_nr == 0) {
                /*
                 * Don't compute percentage of checked out files if we
                 * aren't in a sparse checkout or would get division by 0.