From: Ayush Chandekar Date: Tue, 10 Jun 2025 13:02:20 +0000 (+0530) Subject: environment: remove the global variable 'core_preload_index' X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1d47b464e553331c555f122c5e341dfbfb618bd;p=thirdparty%2Fgit.git environment: remove the global variable 'core_preload_index' The global variable 'core_preload_index' is used in a single function named 'preload_index()' in "preload-index.c". Move its declaration inside that function, removing unnecessary global state. This change is part of an ongoing effort to eliminate global variables, improve modularity and help libify the codebase. Mentored-by: Christian Couder Mentored-by: Ghanshyam Thakkar Signed-off-by: Ayush Chandekar Signed-off-by: Junio C Hamano --- diff --git a/config.c b/config.c index b18b5617fc..eb60c293ab 100644 --- a/config.c +++ b/config.c @@ -1595,11 +1595,6 @@ static int git_default_core_config(const char *var, const char *value, return 0; } - if (!strcmp(var, "core.preloadindex")) { - core_preload_index = git_config_bool(var, value); - return 0; - } - if (!strcmp(var, "core.createobject")) { if (!value) return config_error_nonbool(var); diff --git a/environment.c b/environment.c index c61d773e7e..7bf0390a33 100644 --- a/environment.c +++ b/environment.c @@ -113,9 +113,6 @@ const char *comment_line_str = "#"; char *comment_line_str_to_free; int auto_comment_line_char; -/* Parallel index stat data preload? */ -int core_preload_index = 1; - /* This is set by setup_git_directory_gently() and/or git_default_config() */ char *git_work_tree_cfg; diff --git a/environment.h b/environment.h index 3d98461a06..9a3d05d414 100644 --- a/environment.h +++ b/environment.h @@ -155,7 +155,6 @@ extern int pack_compression_level; extern unsigned long pack_size_limit_cfg; extern int max_allowed_tree_depth; -extern int core_preload_index; extern int precomposed_unicode; extern int protect_hfs; extern int protect_ntfs; diff --git a/preload-index.c b/preload-index.c index 40ab2abafb..9fee4cc3aa 100644 --- a/preload-index.c +++ b/preload-index.c @@ -19,6 +19,7 @@ #include "repository.h" #include "symlinks.h" #include "trace2.h" +#include "config.h" /* * Mostly randomly chosen maximum thread counts: we @@ -111,6 +112,9 @@ void preload_index(struct index_state *index, struct thread_data data[MAX_PARALLEL]; struct progress_data pd; int t2_sum_lstat = 0; + int core_preload_index = 1; + + repo_config_get_bool(the_repository, "core.preloadindex", &core_preload_index); if (!HAVE_THREADS || !core_preload_index) return;