From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ben Peart" <Ben.Peart@microsoft.com>,
"Jonathan Tan" <jonathantanmy@google.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Mike Hommey" <mh@glandium.org>,
"Lars Schneider" <larsxschneider@gmail.com>,
"Eric Wong" <e@80x24.org>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Jeff Hostetler" <jeffhost@microsoft.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Beat Bolli" <dev+git@drbeat.li>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Derrick Stolee" <stolee@gmail.com>
Subject: [PATCH v6 15/15] Move core_partial_clone_filter_default to promisor-remote.c
Date: Tue, 25 Jun 2019 15:40:39 +0200 [thread overview]
Message-ID: <20190625134039.21707-16-chriscool@tuxfamily.org> (raw)
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
prev parent reply other threads:[~2019-06-25 13:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 13:40 [PATCH v6 00/15] Many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 01/15] t0410: remove pipes after git commands Christian Couder
2019-06-25 13:40 ` [PATCH v6 02/15] fetch-object: make functions return an error code Christian Couder
2019-06-25 13:40 ` [PATCH v6 03/15] Add initial support for many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 04/15] promisor-remote: implement promisor_remote_get_direct() Christian Couder
2019-06-25 13:40 ` [PATCH v6 05/15] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-06-25 13:40 ` [PATCH v6 06/15] promisor-remote: use repository_format_partial_clone Christian Couder
2019-06-25 13:40 ` [PATCH v6 07/15] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-06-25 13:40 ` [PATCH v6 08/15] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-06-25 13:40 ` [PATCH v6 09/15] builtin/fetch: remove unique promisor remote limitation Christian Couder
2019-06-25 13:40 ` [PATCH v6 10/15] t0410: test fetching from many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 11/15] partial-clone: add multiple remotes in the doc Christian Couder
2019-06-25 13:40 ` [PATCH v6 12/15] remote: add promisor and partial clone config to " Christian Couder
2019-06-25 13:40 ` [PATCH v6 13/15] Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} Christian Couder
2019-06-25 13:40 ` [PATCH v6 14/15] Move repository_format_partial_clone to promisor-remote.c Christian Couder
2019-06-25 13:40 ` Christian Couder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190625134039.21707-16-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=dev+git@drbeat.li \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).