From: Christian Couder <christian.cou...@gmail.com>
Let's make the partial clone filter specific to one odb
instead of general to all the odbs.
This makes it possible to have different partial clone
filters for different odbs.
Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
builtin/fetch.c | 2 +-
list-objects-filter-options.c | 28 ++++++++++++++++------------
list-objects-filter-options.h | 3 ++-
odb-helper.h | 1 +
remote-odb.c | 2 ++
t/t0410-partial-clone.sh | 2 +-
t/t5616-partial-clone.sh | 2 +-
7 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index e01b65950c..b8701ef7bc 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1402,7 +1402,7 @@ static inline void fetch_one_setup_partial(struct remote
*remote)
* the config.
*/
if (!filter_options.choice)
- partial_clone_get_default_filter_spec(&filter_options);
+ partial_clone_get_default_filter_spec(&filter_options,
remote->name);
return;
}
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 60452c8f36..755a793664 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -7,6 +7,7 @@
#include "list-objects-filter.h"
#include "list-objects-filter-options.h"
#include "remote-odb.h"
+#include "odb-helper.h"
/*
* Parse value of the argument to the "filter" keyword.
@@ -29,6 +30,9 @@ static int gently_parse_list_objects_filter(
{
const char *v0;
+ if (!arg)
+ return 0;
+
if (filter_options->choice) {
if (errbuf) {
strbuf_init(errbuf, 0);
@@ -116,6 +120,7 @@ void partial_clone_register(
const struct list_objects_filter_options *filter_options)
{
char *cfg_name;
+ char *filter_name;
/* Check if it is already registered */
if (find_odb_helper(remote))
@@ -131,27 +136,26 @@ void partial_clone_register(
/*
* Record the initial filter-spec in the config as
* the default for subsequent fetches from this remote.
- *
- * TODO: move core.partialclonefilter into odb.<name>
*/
- core_partial_clone_filter_default =
- xstrdup(filter_options->filter_spec);
- git_config_set("core.partialclonefilter",
- core_partial_clone_filter_default);
+ filter_name = xstrfmt("odb.%s.partialclonefilter", remote);
+ git_config_set(filter_name, filter_options->filter_spec);
+ free(filter_name);
/* Make sure the config info are reset */
remote_odb_reinit();
}
void partial_clone_get_default_filter_spec(
- struct list_objects_filter_options *filter_options)
+ struct list_objects_filter_options *filter_options,
+ const char *remote)
{
+ struct odb_helper *helper = find_odb_helper(remote);
+
/*
* Parse default value, but silently ignore it if it is invalid.
*/
- if (!core_partial_clone_filter_default)
- return;
- gently_parse_list_objects_filter(filter_options,
- core_partial_clone_filter_default,
- NULL);
+ if (helper)
+ gently_parse_list_objects_filter(filter_options,
+ helper->partial_clone_filter,
+ NULL);
}
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index 0000a61f82..12ceef3230 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -74,6 +74,7 @@ void partial_clone_register(
const char *remote,
const struct list_objects_filter_options *filter_options);
void partial_clone_get_default_filter_spec(
- struct list_objects_filter_options *filter_options);
+ struct list_objects_filter_options *filter_options,
+ const char *remote);
#endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
diff --git a/odb-helper.h b/odb-helper.h
index 950f9f9cd1..9ec3ff5141 100644
--- a/odb-helper.h
+++ b/odb-helper.h
@@ -10,6 +10,7 @@
struct odb_helper {
const char *name; /* odb.<NAME>.* */
const char *remote; /* odb.<NAME>.promisorRemote */
+ const char *partial_clone_filter; /* odb.<NAME>.partialCloneFilter */
struct odb_helper *next;
};
diff --git a/remote-odb.c b/remote-odb.c
index cd1b393b79..57d0215aaa 100644
--- a/remote-odb.c
+++ b/remote-odb.c
@@ -60,6 +60,8 @@ static int remote_odb_config(const char *var, const char
*value, void *data)
return 0;
}
+ if (!strcmp(subkey, "partialclonefilter"))
+ return git_config_string(&o->partial_clone_filter, var, value);
return 0;
}
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 9ead9860f5..8b32be6417 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -26,7 +26,7 @@ promise_and_delete () {
test_expect_success 'promisor remote without filter' '
test_create_repo server &&
git clone --filter="blob:none" "file://$(pwd)/server" client &&
- git -C client config --unset core.partialclonefilter &&
+ git -C client config --unset odb.origin.partialclonefilter &&
git -C client fetch origin
'
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 9897b8db12..12e964c1bc 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -41,7 +41,7 @@ test_expect_success 'do partial clone 1' '
test_cmp expect_1.oids observed.oids &&
test "$(git -C pc1 config --local core.repositoryformatversion)" = "1"
&&
test "$(git -C pc1 config --local odb.origin.promisorRemote)" =
"origin" &&
- test "$(git -C pc1 config --local core.partialclonefilter)" =
"blob:none"
+ test "$(git -C pc1 config --local odb.origin.partialclonefilter)" =
"blob:none"
'
# checkout master to force dynamic object fetch of blobs at HEAD.
--
2.19.0.278.gca5b891cac
