[PATCH v1 7/8] Use odb.origin.partialclonefilter instead of core.partialclonefilter
- From
Christian Couder <christian.couder@gmail.com>
- Date
- May 13, 2018, 10:32 UTC
- Message-ID
- <20180513103232.17514-8-chriscool@tuxfamily.org>
- In-Reply-To
- <20180513103232.17514-1-chriscool@tuxfamily.org>
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 <chriscool@tuxfamily.org> --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 26 ++++++++++++++++---------- list-objects-filter-options.h | 3 ++- odb-helper.h | 1 + odb-remote.c | 2 ++ t/t5616-partial-clone.sh | 2 +- 6 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 82a3e655ba..288d58c0c5 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1350,7 +1350,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 f8a4642d17..59378dfb0a 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 "odb-remote.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,25 +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 */ odb_remote_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. */ - 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 d63210d516..02bc3dbe13 100644 --- a/odb-helper.h +++ b/odb-helper.h @@ -4,6 +4,7 @@ struct odb_helper { const char *name; const char *dealer; + const char *partial_clone_filter; struct odb_helper *next; }; diff --git a/odb-remote.c b/odb-remote.c index 0a734ff379..2c7c35c763 100644 --- a/odb-remote.c +++ b/odb-remote.c @@ -35,6 +35,8 @@ static int odb_remote_config(const char *var, const char *value, void *data) if (!strcmp(subkey, "promisorremote")) 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/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 5ddd1e011c..4231121181 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.590.gbd05bfcafd