From: Tian Yuchen Date: Thu, 25 Jun 2026 16:18:45 GMT Subject: [PATCH v1 2/2] environment: move excludes_file into repo_config_values Message-ID: <20260625161845.7543-3-cat@malon.dev> In-Reply-To: <20260625161845.7543-1-cat@malon.dev> Continue the libification effor by moving the 'excludes_file' global variable into 'struct repo_config_values'. Since 'excludes_file' is a dynamically allocated string (char *), it requires proper memory management. Introduce repo_config_values_clear() to safely free the heap memory when repository instance is destroyed. Note: 'if (repo != the_repository)' fallback logic is temporarily added in both the getter and the clear function. This prevents calling repo_config_values() on uninitialized submodules, which triggers BUG(). Mentored-by: Christian Couder Mentored-by: Ayush Chandekar Mentored-by: Olamide Caleb Bello Signed-off-by: Tian Yuchen --- environment.c | 28 ++++++++++++++++++++++------ environment.h | 15 +++++++++++---- repository.c | 1 + 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/environment.c b/environment.c index 8efcaeafa6..e1c7ed178a 100644 --- a/environment.c +++ b/environment.c @@ -57,7 +57,6 @@ enum fsync_method fsync_method = FSYNC_METHOD_DEFAULT; enum fsync_component fsync_components = FSYNC_COMPONENTS_DEFAULT; char *editor_program; char *askpass_program; -char *excludes_file; enum auto_crlf auto_crlf = AUTO_CRLF_FALSE; enum eol core_eol = EOL_UNSET; int global_conv_flags_eol = CONV_EOL_RNDTRP_WARN; @@ -136,9 +135,13 @@ int is_bare_repository(void) const char *repo_excludes_file(struct repository *repo) { - if (!excludes_file) - excludes_file = xdg_config_home("ignore"); - return excludes_file; + if (!repo || !repo->initialized || repo != the_repository) + return NULL; + + if (!repo_config_values(repo)->excludes_file) + repo_config_values(repo)->excludes_file = xdg_config_home("ignore"); + + return repo_config_values(repo)->excludes_file; } int have_git_dir(void) @@ -468,8 +471,8 @@ int git_default_core_config(const char *var, const char *value, } if (!strcmp(var, "core.excludesfile")) { - FREE_AND_NULL(excludes_file); - return git_config_pathname(&excludes_file, var, value); + FREE_AND_NULL(cfg->excludes_file); + return git_config_pathname(&cfg->excludes_file, var, value); } if (!strcmp(var, "core.whitespace")) { @@ -733,3 +736,16 @@ void repo_config_values_init(struct repo_config_values *cfg) cfg->sparse_expect_files_outside_of_patterns = 0; cfg->warn_on_object_refname_ambiguity = 1; } + +void repo_config_values_clear(struct repository *repo) +{ + struct repo_config_values *cfg; + + if (repo != the_repository) + return; + + cfg = repo_config_values(repo); + if (!cfg) + return; + FREE_AND_NULL(cfg->excludes_file); +} diff --git a/environment.h b/environment.h index 52d531e4ea..2839913551 100644 --- a/environment.h +++ b/environment.h @@ -98,6 +98,7 @@ struct repo_config_values { int precomposed_unicode; int core_sparse_checkout_cone; int warn_on_object_refname_ambiguity; + char *excludes_file; /* section "sparse" config values */ int sparse_expect_files_outside_of_patterns; @@ -133,13 +134,20 @@ int git_default_config(const char *, const char *, int git_default_core_config(const char *var, const char *value, const struct config_context *ctx, void *cb); -/* - * TODO: This still relies on the global state. - */ const char *repo_excludes_file(struct repository *repo); void repo_config_values_init(struct repo_config_values *cfg); +/* + * Frees memory allocated for dynamically loaded configuration values + * inside `repo_config_values`. + * + * Note: `excludes_file` is currently the only heap-allocated field in + * this struct. As other dynamically allocated variables are migrated, + * their FREE_AND_NULL() calls should be appended here. + */ +void repo_config_values_clear(struct repository *repo); + /* * TODO: All the below state either explicitly or implicitly relies on * `the_repository`. We should eventually get rid of these and make the @@ -213,7 +221,6 @@ extern char *git_log_output_encoding; extern char *editor_program; extern char *askpass_program; -extern char *excludes_file; /* * The character that begins a commented line in user-editable file diff --git a/repository.c b/repository.c index 187dd471c4..b31f1b7852 100644 --- a/repository.c +++ b/repository.c @@ -388,6 +388,7 @@ void repo_clear(struct repository *repo) FREE_AND_NULL(repo->parsed_objects); repo_settings_clear(repo); + repo_config_values_clear(repo); if (repo->config) { git_configset_clear(repo->config); -- 2.43.0