config: pass repo to `git_config_get_split_index()`

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>

diff --git a/builtin/update-index.c b/builtin/update-index.c
index d343416ae261ff9789ad3013a5be81b307dc8800..35a1f957adc8608613ec05b7ac3668048adef4e5 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -1156,7 +1156,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
        end_odb_transaction();
 
        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; "
                                  "remove or change it, if you really want to "
                                  "enable split index"));
@@ -1165,7 +1165,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                else
                        add_split_index(the_repository->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; "
                                  "remove or change it, if you really want to "
                                  "disable split index"));

diff --git a/config.c b/config.c
index 387c7282e91877ac427e9d9fec6c692068311c82..89fb7ce6b1065014baff744cdb7dda7ffa13752d 100644 (file)
--- a/config.c
+++ b/config.c
@@ -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 */
 }
 
-int git_config_get_split_index(void)
+int repo_config_get_split_index(struct repository *r)
 {
        int val;
 
-       if (!git_config_get_maybe_bool("core.splitindex", &val))
+       if (!repo_config_get_maybe_bool(r, "core.splitindex", &val))
                return val;
 
        return -1; /* default value */

diff --git a/config.h b/config.h
index 3f68b300478c8a35d95f61174c76d6eca0fc1836..35cee9d4ca319e3de74cc3d91f2f8efb25977b7e 100644 (file)
--- a/config.h
+++ b/config.h
@@ -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 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);
 
 /* This dies if the configured or default date is in the future */

diff --git a/read-cache.c b/read-cache.c
index ad09950153e59adc0d1907bb17f415ba597dcf21..12c2da5a8ba326f657a16f8e23433cfd007e0075 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1945,7 +1945,7 @@ static void tweak_untracked_cache(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 */
                break;
        case 0: /* false */