config: pass repo to `git_config_get_index_threads()`

Refactor `git_config_get_index_threads()` 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/config.c b/config.c
index 476cd73c9e249bc970fde34becedc4f6179cda4e..387c7282e91877ac427e9d9fec6c692068311c82 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2826,7 +2826,7 @@ int git_config_get_max_percent_split_change(void)
        return -1; /* default value */
 }
 
-int git_config_get_index_threads(int *dest)
+int repo_config_get_index_threads(struct repository *r, int *dest)
 {
        int is_bool, val;
 
@@ -2836,7 +2836,7 @@ int git_config_get_index_threads(int *dest)
                return 0;
        }
 
-       if (!git_config_get_bool_or_int("index.threads", &is_bool, &val)) {
+       if (!repo_config_get_bool_or_int(r, "index.threads", &is_bool, &val)) {
                if (is_bool)
                        *dest = val ? 0 : 1;
                else

diff --git a/config.h b/config.h
index 8eb3efa0c411ad916659d74dfd3e12ded410020b..3f68b300478c8a35d95f61174c76d6eca0fc1836 100644 (file)
--- a/config.h
+++ b/config.h
@@ -710,7 +710,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_index_threads(int *dest);
+int repo_config_get_index_threads(struct repository *r, int *dest);
 int git_config_get_split_index(void);
 int git_config_get_max_percent_split_change(void);
 

diff --git a/read-cache.c b/read-cache.c
index 742369b295f86c2244a8a2db043ed16fea5686d2..ad09950153e59adc0d1907bb17f415ba597dcf21 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -2267,7 +2267,7 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 
        src_offset = sizeof(*hdr);
 
-       if (git_config_get_index_threads(&nr_threads))
+       if (repo_config_get_index_threads(the_repository, &nr_threads))
                nr_threads = 1;
 
        /* TODO: does creating more threads than cores help? */
@@ -2787,7 +2787,7 @@ static int record_eoie(void)
         * used for threading is written by default if the user
         * explicitly requested threaded index reads.
         */
-       return !git_config_get_index_threads(&val) && val != 1;
+       return !repo_config_get_index_threads(the_repository, &val) && val != 1;
 }
 
 static int record_ieot(void)
@@ -2802,7 +2802,7 @@ static int record_ieot(void)
         * written by default if the user explicitly requested
         * threaded index reads.
         */
-       return !git_config_get_index_threads(&val) && val != 1;
+       return !repo_config_get_index_threads(the_repository, &val) && val != 1;
 }
 
 enum write_extensions {
@@ -2875,7 +2875,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 
        hashwrite(f, &hdr, sizeof(hdr));
 
-       if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads))
+       if (!HAVE_THREADS || repo_config_get_index_threads(the_repository, &nr_threads))
                nr_threads = 1;
 
        if (nr_threads != 1 && record_ieot()) {