mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: pass repo to git_config_get_split_index()

Browse Source 
Refactor `git_config_get_split_index()` to accept a `struct repository`
such that we can get rid of the implicit dependency on `the_repository`.
Rename the function accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-08-13 11:13:54 +02:00
committed by Junio C Hamano
parent 1870cc30d4
commit be7537e6a9
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/update-index.c
View File

@ -1156,7 +1156,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
end_odb_transaction(); end_odb_transaction();
if (split_index > 0) { if (split_index > 0) {
if (git_config_get_split_index() == 0) if (repo_config_get_split_index(the_repository) == 0)
warning(_("core.splitIndex is set to false; " warning(_("core.splitIndex is set to false; "
"remove or change it, if you really want to " "remove or change it, if you really want to "
"enable split index")); "enable split index"));
@ -1165,7 +1165,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
else else
add_split_index(the_repository->index); add_split_index(the_repository->index);
} else if (!split_index) { } else if (!split_index) {
if (git_config_get_split_index() == 1) if (repo_config_get_split_index(the_repository) == 1)
warning(_("core.splitIndex is set to true; " warning(_("core.splitIndex is set to true; "
"remove or change it, if you really want to " "remove or change it, if you really want to "
"disable split index")); "disable split index"));

4
config.c
View File

@ -2801,11 +2801,11 @@ int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestam
return -1; /* thing exists but cannot be parsed */ return -1; /* thing exists but cannot be parsed */
} }
int git_config_get_split_index(void) int repo_config_get_split_index(struct repository *r)
{ {
int val; int val;
if (!git_config_get_maybe_bool("core.splitindex", &val)) if (!repo_config_get_maybe_bool(r, "core.splitindex", &val))
return val; return val;
return -1; /* default value */ return -1; /* default value */

2
config.h
View File

@ -711,7 +711,7 @@ int git_config_get_maybe_bool(const char *key, int *dest);
int git_config_get_pathname(const char *key, char **dest); int git_config_get_pathname(const char *key, char **dest);
int repo_config_get_index_threads(struct repository *r, int *dest); int repo_config_get_index_threads(struct repository *r, int *dest);
int git_config_get_split_index(void); int repo_config_get_split_index(struct repository *r);
int git_config_get_max_percent_split_change(void); int git_config_get_max_percent_split_change(void);
/* This dies if the configured or default date is in the future */ /* This dies if the configured or default date is in the future */

2
read-cache.c
View File

@ -1945,7 +1945,7 @@ static void tweak_untracked_cache(struct index_state *istate)
static void tweak_split_index(struct index_state *istate) static void tweak_split_index(struct index_state *istate)
{ {
switch (git_config_get_split_index()) { switch (repo_config_get_split_index(the_repository)) {
case -1: /* unset: do nothing */ case -1: /* unset: do nothing */
break; break;
case 0: /* false */ case 0: /* false */