From 1dba24dc9f211fba4f61cb225159c0c740089876 Mon Sep 17 00:00:00 2001 From: Olamide Caleb Bello Date: Tue, 13 Jan 2026 17:44:00 +0100 Subject: [PATCH 1/3] environment: stop storing `core.attributesFile` globally The config value parsed in git_default_core_config() is loaded eagerly and stored in the global variable `git_attributes_file`. Storing this value in a global variable can lead to unexpected behaviours when more than one Git repository run in the same Git process. Move this value into a `struct repo_config_values` which holds all the values parsed by `git_default_config()` and can be accessed per repository via `git_default_config()`. This will ensure the current behaviour remains the same while also enabling the libification of Git. It is important to note that `git_default_config()` is a wrapper to other `git_default_*_config()` such as `git_default_core_config()`. Therefore to access and modify this global variable, the change has to be made in the function which parses and stores the value in the global variable. Suggested-by: Phillip Wood Mentored-by: Christian Couder Mentored-by: Usman Akinyemi Signed-off-by: Olamide Caleb Bello Signed-off-by: Junio C Hamano --- attr.c | 7 ++++--- environment.c | 7 ++++--- environment.h | 7 ++++++- repository.h | 4 ++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/attr.c b/attr.c index 4999b7e09d..fbb9eaffaf 100644 --- a/attr.c +++ b/attr.c @@ -881,10 +881,11 @@ const char *git_attr_system_file(void) const char *git_attr_global_file(void) { - if (!git_attributes_file) - git_attributes_file = xdg_config_home("attributes"); + struct repo_config_values *cfg = &the_repository->config_values; + if (!cfg->attributes_file_path) + cfg->attributes_file_path = xdg_config_home("attributes"); - return git_attributes_file; + return cfg->attributes_file_path; } int git_attr_system_is_enabled(void) diff --git a/environment.c b/environment.c index a770b5921d..2789c3514a 100644 --- a/environment.c +++ b/environment.c @@ -53,7 +53,6 @@ char *git_commit_encoding; char *git_log_output_encoding; char *apply_default_whitespace; char *apply_default_ignorewhitespace; -char *git_attributes_file; int zlib_compression_level = Z_BEST_SPEED; int pack_compression_level = Z_DEFAULT_COMPRESSION; int fsync_object_files = -1; @@ -327,6 +326,8 @@ next_name: static int git_default_core_config(const char *var, const char *value, const struct config_context *ctx, void *cb) { + struct repo_config_values *cfg = &the_repository->config_values; + /* This needs a better name */ if (!strcmp(var, "core.filemode")) { trust_executable_bit = git_config_bool(var, value); @@ -364,8 +365,8 @@ static int git_default_core_config(const char *var, const char *value, } if (!strcmp(var, "core.attributesfile")) { - FREE_AND_NULL(git_attributes_file); - return git_config_pathname(&git_attributes_file, var, value); + FREE_AND_NULL(cfg->attributes_file_path); + return git_config_pathname(&cfg->attributes_file_path, var, value); } if (!strcmp(var, "core.bare")) { diff --git a/environment.h b/environment.h index 51898c99cd..8c7803425e 100644 --- a/environment.h +++ b/environment.h @@ -84,6 +84,12 @@ extern const char * const local_repo_env[]; struct strvec; +/* Config values parsed by git_default_config() */ +struct repo_config_values { + /* core config values */ + char *attributes_file_path; +}; + /* * Wrapper of getenv() that returns a strdup value. This value is kept * in argv to be freed later. @@ -152,7 +158,6 @@ extern int assume_unchanged; extern int warn_on_object_refname_ambiguity; extern char *apply_default_whitespace; extern char *apply_default_ignorewhitespace; -extern char *git_attributes_file; extern int zlib_compression_level; extern int pack_compression_level; extern unsigned long pack_size_limit_cfg; diff --git a/repository.h b/repository.h index 6063c4b846..638a142577 100644 --- a/repository.h +++ b/repository.h @@ -3,6 +3,7 @@ #include "strmap.h" #include "repo-settings.h" +#include "environment.h" struct config_set; struct git_hash_algo; @@ -148,6 +149,9 @@ struct repository { /* Repository's compatibility hash algorithm. */ const struct git_hash_algo *compat_hash_algo; + /* Repository's config values parsed by git_default_config() */ + struct repo_config_values config_values; + /* Repository's reference storage format, as serialized on disk. */ enum ref_storage_format ref_storage_format; From dae2d08cad0d2d4022f0f1ba2689b9680b3de95d Mon Sep 17 00:00:00 2001 From: Olamide Caleb Bello Date: Tue, 13 Jan 2026 17:44:01 +0100 Subject: [PATCH 2/3] environment: environment: stop using core.sparseCheckout globally The config value `core.sparseCheckout` is parsed in `git_default_core_config()` and stored globally in `core_appy_sparse_checkout`. This could cause unintended behaviours when different Git repositories running in the same process access this variable. Move the parsed value into `struct repo_config_values` which holds all the values parsed by `git_default_config()` and can be accessed per repo via `git_default_config()`. This retains current behaviours while achieving the repository scoped access. Suggested-by: Phillip Wood Mentored-by: Christian Couder Mentored-by: Usman Akinyemi Signed-off-by: Olamide Caleb Bello Signed-off-by: Junio C Hamano --- builtin/backfill.c | 3 +-- builtin/clone.c | 2 +- builtin/grep.c | 2 +- builtin/mv.c | 2 +- builtin/sparse-checkout.c | 22 +++++++++++----------- builtin/worktree.c | 2 +- dir.c | 2 +- environment.c | 3 +-- environment.h | 2 +- sparse-index.c | 6 ++++-- unpack-trees.c | 2 +- wt-status.c | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/builtin/backfill.c b/builtin/backfill.c index e80fc1b694..90d5312240 100644 --- a/builtin/backfill.c +++ b/builtin/backfill.c @@ -1,4 +1,3 @@ -/* We need this macro to access core_apply_sparse_checkout */ #define USE_THE_REPOSITORY_VARIABLE #include "builtin.h" @@ -139,7 +138,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 = repo->config_values.sparse_checkout; result = do_backfill(&ctx); backfill_context_clear(&ctx); diff --git a/builtin/clone.c b/builtin/clone.c index b19b302b06..b6b19e83d1 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -623,7 +623,7 @@ static int git_sparse_checkout_init(const char *repo) * We must apply the setting in the current process * for the later checkout to use the sparse-checkout file. */ - core_apply_sparse_checkout = 1; + the_repository->config_values.sparse_checkout = 1; cmd.git_cmd = 1; if (run_command(&cmd)) { diff --git a/builtin/grep.c b/builtin/grep.c index 53cccf2d25..525edb5e9c 100644 --- 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. "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 d43925097b..511620747b 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -572,7 +572,7 @@ remove_entry: rename_index_entry_at(the_repository->index, pos, dst); if (ignore_sparse && - core_apply_sparse_checkout && + the_repository->config_values.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 15d51e60a8..1c2c39b968 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -63,7 +63,7 @@ static int sparse_checkout_list(int argc, const char **argv, const char *prefix, int res; setup_work_tree(); - if (!core_apply_sparse_checkout) + if (!the_repository->config_values.sparse_checkout) die(_("this worktree is not sparse")); argc = parse_options(argc, argv, prefix, @@ -400,11 +400,11 @@ static int set_config(struct repository *repo, static enum sparse_checkout_mode update_cone_mode(int *cone_mode) { /* If not specified, use previous definition of cone mode */ - if (*cone_mode == -1 && core_apply_sparse_checkout) + if (*cone_mode == -1 && the_repository->config_values.sparse_checkout) *cone_mode = core_sparse_checkout_cone; /* Set cone/non-cone mode appropriately */ - core_apply_sparse_checkout = 1; + the_repository->config_values.sparse_checkout = 1; if (*cone_mode == 1 || *cone_mode == -1) { core_sparse_checkout_cone = 1; return MODE_CONE_PATTERNS; @@ -418,7 +418,7 @@ static int update_modes(struct repository *repo, int *cone_mode, int *sparse_ind int mode, record_mode; /* 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) || !repo->config_values.sparse_checkout; mode = update_cone_mode(cone_mode); if (record_mode && set_config(repo, mode)) @@ -699,9 +699,9 @@ static int modify_pattern_list(struct repository *repo, break; } - if (!core_apply_sparse_checkout) { + if (!repo->config_values.sparse_checkout) { set_config(repo, MODE_ALL_PATTERNS); - core_apply_sparse_checkout = 1; + repo->config_values.sparse_checkout = 1; changed_config = 1; } @@ -798,7 +798,7 @@ static int sparse_checkout_add(int argc, const char **argv, const char *prefix, int ret; setup_work_tree(); - if (!core_apply_sparse_checkout) + if (!repo->config_values.sparse_checkout) die(_("no sparse-checkout to add to")); repo_read_index(repo); @@ -907,7 +907,7 @@ static int sparse_checkout_reapply(int argc, const char **argv, }; setup_work_tree(); - if (!core_apply_sparse_checkout) + if (!repo->config_values.sparse_checkout) die(_("must be in a sparse-checkout to reapply sparsity patterns")); reapply_opts.cone_mode = -1; @@ -969,7 +969,7 @@ static int sparse_checkout_clean(int argc, const char **argv, }; setup_work_tree(); - if (!core_apply_sparse_checkout) + if (!repo->config_values.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")); @@ -1035,7 +1035,7 @@ static int sparse_checkout_disable(int argc, const char **argv, struct pattern_list pl; /* - * We do not exit early if !core_apply_sparse_checkout; due to the + * We do not exit early if !repo->config_values.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 +1061,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; + repo->config_values.sparse_checkout = 1; add_pattern("/*", empty_base, 0, &pl, 0); diff --git a/builtin/worktree.c b/builtin/worktree.c index fbdaf2eb2e..e401b8253e 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -536,7 +536,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 (wt->repo->config_values.sparse_checkout) copy_sparse_checkout(sb_repo.buf); /* diff --git a/dir.c b/dir.c index b00821f294..56b412a6d2 100644 --- a/dir.c +++ b/dir.c @@ -1551,7 +1551,7 @@ done: int init_sparse_checkout_patterns(struct index_state *istate) { - if (!core_apply_sparse_checkout) + if (!istate->repo->config_values.sparse_checkout) return 1; if (istate->sparse_checkout_patterns) return 0; diff --git a/environment.c b/environment.c index 2789c3514a..65919a6c52 100644 --- 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->sparse_checkout = git_config_bool(var, value); return 0; } diff --git a/environment.h b/environment.h index 8c7803425e..5caf73b4b8 100644 --- a/environment.h +++ b/environment.h @@ -88,6 +88,7 @@ struct strvec; struct repo_config_values { /* core config values */ char *attributes_file_path; + int sparse_checkout; }; /* @@ -167,7 +168,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 76f90da5f5..6dd8dd679d 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -152,7 +152,8 @@ 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 = &istate->repo->config_values; + if (!cfg->sparse_checkout || !core_sparse_checkout_cone) return 0; if (!(flags & SPARSE_INDEX_MEMORY_ONLY)) { @@ -670,7 +671,8 @@ 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 = &istate->repo->config_values; + if (!cfg->sparse_checkout || sparse_expect_files_outside_of_patterns) return; diff --git a/unpack-trees.c b/unpack-trees.c index f38c761ab9..2bdfa1334c 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1924,7 +1924,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 (!repo->config_values.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 e12adb26b9..a2e388606f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1764,7 +1764,7 @@ static void wt_status_check_sparse_checkout(struct repository *r, int skip_worktree = 0; int i; - if (!core_apply_sparse_checkout || r->index->cache_nr == 0) { + if (!r->config_values.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. From 020ca15a2e00c19e501f18903dfc7cdaf3dca8a9 Mon Sep 17 00:00:00 2001 From: Olamide Caleb Bello Date: Tue, 13 Jan 2026 17:44:02 +0100 Subject: [PATCH 3/3] 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 Mentored-by: Christian Couder Mentored-by: Usman Akinyemi Signed-off-by: Olamide Caleb Bello Signed-off-by: Junio C Hamano --- branch.h | 2 -- builtin/branch.c | 2 +- builtin/checkout.c | 2 +- builtin/push.c | 2 +- builtin/submodule--helper.c | 2 +- environment.c | 16 +++++++++++----- environment.h | 6 ++++++ repository.c | 1 + 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/branch.h b/branch.h index ec2f35fda4..3dc6e2a0ff 100644 --- 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 c577b5d20f..d75114b41c 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -795,7 +795,7 @@ int cmd_branch(int argc, if (!sorting_options.nr) string_list_append(&sorting_options, "refname"); - track = git_branch_track; + track = the_repository->config_values.git_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 66b69df6e6..adf606c493 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1631,7 +1631,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 = the_repository->config_values.git_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 5b6cebbb85..68105ecb2d 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -162,7 +162,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 (the_repository->config_values.git_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 d537ab087a..7239722e48 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -3128,7 +3128,7 @@ static int module_create_branch(int argc, const char **argv, const char *prefix, }; repo_config(the_repository, git_default_config, NULL); - track = git_branch_track; + track = the_repository->config_values.git_branch_track; argc = parse_options(argc, argv, prefix, options, usage, 0); if (argc != 3) diff --git a/environment.c b/environment.c index 65919a6c52..437d14e1ae 100644 --- 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 = &the_repository->config_values; + if (!strcmp(var, "branch.autosetupmerge")) { if (value && !strcmp(value, "always")) { - git_branch_track = BRANCH_TRACK_ALWAYS; + cfg->git_branch_track = BRANCH_TRACK_ALWAYS; return 0; } else if (value && !strcmp(value, "inherit")) { - git_branch_track = BRANCH_TRACK_INHERIT; + cfg->git_branch_track = BRANCH_TRACK_INHERIT; return 0; } else if (value && !strcmp(value, "simple")) { - git_branch_track = BRANCH_TRACK_SIMPLE; + cfg->git_branch_track = BRANCH_TRACK_SIMPLE; return 0; } - git_branch_track = git_config_bool(var, value); + cfg->git_branch_track = git_config_bool(var, value); return 0; } if (!strcmp(var, "branch.autosetuprebase")) { @@ -756,3 +757,8 @@ int git_default_config(const char *var, const char *value, /* Add other config variables here and to Documentation/config.adoc. */ return 0; } + +void repo_config_values_init(struct repo_config_values *cfg) +{ + cfg->git_branch_track = BRANCH_TRACK_REMOTE; +} diff --git a/environment.h b/environment.h index 5caf73b4b8..bfcdffe836 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 { /* core config values */ char *attributes_file_path; int sparse_checkout; + + /* branch config values */ + enum branch_track git_branch_track; }; /* @@ -114,6 +118,8 @@ const char *strip_namespace(const char *namespaced_ref); int git_default_config(const char *, const char *, const struct config_context *, void *); +void repo_config_values_init(struct repo_config_values *cfg); + /* * TODO: All the below state either explicitly or implicitly relies on * `the_repository`. We should eventually get rid of these and make the diff --git a/repository.c b/repository.c index c7e75215ac..d308cd78bf 100644 --- a/repository.c +++ b/repository.c @@ -57,6 +57,7 @@ void initialize_repository(struct repository *repo) ALLOC_ARRAY(repo->index, 1); index_state_init(repo->index, repo); repo->check_deprecated_config = true; + repo_config_values_init(&repo->config_values); /* * When a command runs inside a repository, it learns what