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 <[email protected]> --- builtin/fetch.c | 2 +- external-odb.c | 2 ++ list-objects-filter-options.c | 23 +++++++++++++---------- list-objects-filter-options.h | 3 ++- odb-helper.h | 1 + t/t5616-partial-clone.sh | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index f4a138acc8..11c9561bb4 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1333,7 +1333,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/external-odb.c b/external-odb.c index 8be92277d2..c3d90f39fb 100644 --- a/external-odb.c +++ b/external-odb.c @@ -47,6 +47,8 @@ static int external_odb_config(const char *var, const char *value, void *data) o->type = ODB_HELPER_SUBPROCESS_CMD; return git_config_string(&o->dealer, var, value); } + if (!strcmp(subkey, "partialclonefilter")) + return git_config_string(&o->partial_clone_filter, var, value); return 0; } diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index 12e52bf659..ff493b9163 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 "external-odb.h" +#include "odb-helper.h" /* * Parse value of the argument to the "filter" keyword. @@ -116,6 +117,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, ODB_HELPER_GIT_REMOTE)) @@ -131,25 +133,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 */ external_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, ODB_HELPER_GIT_REMOTE); + /* * Parse default value, but silently ignore it if it is invalid. */ - 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 2c529af6af..3ec2d8448f 100644 --- a/odb-helper.h +++ b/odb-helper.h @@ -17,6 +17,7 @@ struct odb_helper { enum odb_helper_type type; unsigned int supported_capabilities; int initialized; + const char *partial_clone_filter; struct odb_helper_object { struct object_id oid; diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 5c84b0f95b..d9b8418275 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.17.0.rc0.37.g8f476fabe9
