Re: [PATCH 9/9] fetch-pack: wire up and enable auto filter logic
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 7, 2026, 10:05 UTC
- Message-ID
- <aV4v--FYaHCLLrPz@pks.im>
- In-Reply-To
- <20251223111113.47473-10-christian.couder@gmail.com>
On Tue, Dec 23, 2025 at 12:11:13PM +0100, Christian Couder wrote:
Show 20 quoted lines
> diff --git a/Documentation/fetch-options.adoc b/Documentation/fetch-options.adoc > index 70a9818331..f7432d4b29 100644 > --- a/Documentation/fetch-options.adoc > +++ b/Documentation/fetch-options.adoc > @@ -92,11 +92,20 @@ precedence over the `fetch.output` config option. > Use the partial clone feature and request that the server sends > a subset of reachable objects according to a given object filter. > When using `--filter`, the supplied _<filter-spec>_ is used for > - the partial fetch. For example, `--filter=blob:none` will filter > - out all blobs (file contents) until needed by Git. Also, > - `--filter=blob:limit=<size>` will filter out all blobs of size > - at least _<size>_. For more details on filter specifications, see > - the `--filter` option in linkgit:git-rev-list[1]. > + the partial fetch. > ++ > +If `--filter=auto` is used, the filter specification is determined > +automatically by combining the filter specifications advertised by > +the server for the promisor remotes that the client accepts (see > +linkgit:gitprotocol-v2[5] and the `promisor.acceptFromServer` > +configuration option in linkgit:git-config[1]).
Okay, so if "promisor.acceptFromServer" enables a subset of advertised promisors we will automatically use their advertised filters. But what about the case where we already have a set of local promisors with their own filters, would those also honored by "--filter=auto"?
Show 26 quoted lines
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 186e5498d4..41bbaea72a 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -1001,6 +1001,8 @@ int cmd_clone(int argc,
> NULL
> };
>
> + filter_options.allow_auto_filter = 1;
> +
> packet_trace_identity("clone");
>
> repo_config(the_repository, git_clone_config, NULL);
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index b984173447..ddc30a0d30 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -2439,6 +2439,8 @@ int cmd_fetch(int argc,
> OPT_END()
> };
>
> + filter_options.allow_auto_filter = 1;
> +
> packet_trace_identity("fetch");
>
> /* Record the command line for the reflog */Nice that both of these changes are so easy now.
Show 23 quoted lines
> diff --git a/fetch-pack.c b/fetch-pack.c
> index 40316c9a34..12ccea0dab 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -1661,6 +1662,25 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
> struct string_list packfile_uris = STRING_LIST_INIT_DUP;
> int i;
> struct strvec index_pack_args = STRVEC_INIT;
> + const char *promisor_remote_config;
> +
> + if (server_feature_v2("promisor-remote", &promisor_remote_config)) {
> + char *remote_name = promisor_remote_reply(promisor_remote_config);
> + free(remote_name);
> + }
> +
> + if (args->filter_options.choice == LOFC_AUTO) {
> + struct strbuf errbuf = STRBUF_INIT;
> + char *constructed_filter = promisor_remote_construct_filter(r);
> +
> + list_objects_filter_resolve_auto(&args->filter_options,
> + constructed_filter, &errbuf);
> + if (errbuf.len > 0)
> + die(_("couldn't resolve 'auto' filter: %s"), errbuf.buf);Now that I see it being used I think that the calling convention of this function is a bit weird. I would've expected the function to return an error code that the caller can consult instead of having to check for `errbuf.len`.
Patrick