Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-05-05 15:11:58 +0300
committerJunio C Hamano <gitster@pobox.com>2021-05-06 06:53:46 +0300
commitb79f9c075d4cb61bd7d030e9589ad50ec9e83a60 (patch)
treef4a96db987ac53aec25a99ee318dabe7d005a8be /sparse-index.c
parent7e391989789db82983665667013a46eabc6fc570 (diff)
sparse-index.c: remove set_index_sparse_config()
Remove the set_index_sparse_config() function by folding it into set_sparse_index_config(), which was its only user. Since 122ba1f7b52 (sparse-checkout: toggle sparse index from builtin, 2021-03-30) the flow of this code hasn't made much sense, we'd get "enabled" in set_sparse_index_config(), proceed to call set_index_sparse_config() with it. There we'd call prepare_repo_settings() and set "repo->settings.sparse_index = 1", only to needlessly call prepare_repo_settings() again in set_sparse_index_config() (where it would early abort), and finally setting "repo->settings.sparse_index = enabled". Instead we can just call prepare_repo_settings() once, and set the variable to "enabled" in the first place. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sparse-index.c')
-rw-r--r--sparse-index.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/sparse-index.c b/sparse-index.c
index 6f21397e2e..b0d5dc5f08 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -102,7 +102,7 @@ static int convert_to_sparse_rec(struct index_state *istate,
return num_converted - start_converted;
}
-static int set_index_sparse_config(struct repository *repo, int enable)
+int set_sparse_index_config(struct repository *repo, int enable)
{
int res;
char *config_path = repo_git_path(repo, "config.worktree");
@@ -112,15 +112,6 @@ static int set_index_sparse_config(struct repository *repo, int enable)
free(config_path);
prepare_repo_settings(repo);
- repo->settings.sparse_index = 1;
- return res;
-}
-
-int set_sparse_index_config(struct repository *repo, int enable)
-{
- int res = set_index_sparse_config(repo, enable);
-
- prepare_repo_settings(repo);
repo->settings.sparse_index = enable;
return res;
}