[PATCH v6 15/15] Move core_partial_clone_filter_default to promisor-remote.c
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Jun 25, 2019, 13:40 UTC
- Message-ID
- <20190625134039.21707-16-chriscool@tuxfamily.org>
- In-Reply-To
- <20190625134039.21707-1-chriscool@tuxfamily.org>
Now that we can have a different default partial clone filter for each promisor remote, let's hide core_partial_clone_filter_default as a static in promisor-remote.c to avoid it being use for anything other than managing backward compatibility.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- cache.h | 1 - config.c | 5 ----- environment.c | 1 - promisor-remote.c | 5 +++++ 4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/cache.h b/cache.h index e34b9e66d2..a4d7f84eeb 100644 --- a/cache.h +++ b/cache.h @@ -961,7 +961,6 @@ extern int grafts_replace_parents; #define GIT_REPO_VERSION 0 #define GIT_REPO_VERSION_READ 1 extern int repository_format_precious_objects; -extern const char *core_partial_clone_filter_default; extern int repository_format_worktree_config; /* diff --git a/config.c b/config.c index 296a6d9cc4..317b226bc8 100644 --- a/config.c +++ b/config.c @@ -1344,11 +1344,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp(var, "core.partialclonefilter")) { - return git_config_string(&core_partial_clone_filter_default, - var, value); - } - if (!strcmp(var, "core.usereplacerefs")) { read_replace_refs = git_config_bool(var, value); return 0; diff --git a/environment.c b/environment.c index 8855d2fc11..efa072680a 100644 --- a/environment.c +++ b/environment.c @@ -31,7 +31,6 @@ int warn_ambiguous_refs = 1; int warn_on_object_refname_ambiguity = 1; int ref_paranoia = -1; int repository_format_precious_objects; -const char *core_partial_clone_filter_default; int repository_format_worktree_config; const char *git_commit_encoding; const char *git_log_output_encoding; diff --git a/promisor-remote.c b/promisor-remote.c index 31d51bb50e..9bc296cdde 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -5,6 +5,7 @@ #include "transport.h" static char *repository_format_partial_clone; +static const char *core_partial_clone_filter_default; void set_repository_format_partial_clone(char *partial_clone) { @@ -103,6 +104,10 @@ static int promisor_remote_config(const char *var, const char *value, void *data int namelen; const char *subkey; + if (!strcmp(var, "core.partialclonefilter")) + return git_config_string(&core_partial_clone_filter_default, + var, value); + if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0) return 0;
-- 2.22.0.229.ga13d9ffdf7.dirty