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>, Stefan Beller <sbeller@google.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> Subject: [PATCH v3 08/11] builtin/fetch: remove unique promisor remote limitation Date: Tue, 12 Mar 2019 14:29:56 +0100 Message-ID: <20190312132959.11764-9-chriscool@tuxfamily.org> (raw) In-Reply-To: <20190312132959.11764-1-chriscool@tuxfamily.org> As the infrastructure for more than one promisor remote has been introduced in previous patches, we can remove code that forbids the registration of more than one promisor remote. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- builtin/fetch.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 9d436bd727..56c6827165 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1465,26 +1465,16 @@ static inline void fetch_one_setup_partial(struct remote *remote) return; /* - * If this is the FIRST partial-fetch request, we enable partial - * on this repo and remember the given filter-spec as the default - * for subsequent fetches to this remote. + * If this is a partial-fetch request, we enable partial on + * this repo if not already enabled and remember the given + * filter-spec as the default for subsequent fetches to this + * remote. */ - if (!has_promisor_remote() && filter_options.choice) { + if (filter_options.choice) { partial_clone_register(remote->name, &filter_options); return; } - /* - * We are currently limited to only ONE promisor remote and only - * allow partial-fetches from the promisor remote. - */ - if (!promisor_remote_find(remote->name)) { - if (filter_options.choice) - die(_("--filter can only be used with the remote " - "configured in extensions.partialClone")); - return; - } - /* * Do a partial-fetch from the promisor remote using either the * explicitly given filter-spec or inherit the filter-spec from -- 2.21.0.166.gb5e4dbcfd3
next prev parent reply other threads:[~2019-03-12 13:30 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-12 13:29 [PATCH v3 00/11] Many promisor remotes Christian Couder 2019-03-12 13:29 ` [PATCH v3 01/11] fetch-object: make functions return an error code Christian Couder 2019-03-12 13:29 ` [PATCH v3 02/11] Add initial support for many promisor remotes Christian Couder 2019-03-13 4:09 ` Junio C Hamano 2019-03-13 4:34 ` Junio C Hamano 2019-04-01 16:41 ` Christian Couder 2019-03-12 13:29 ` [PATCH v3 03/11] promisor-remote: implement promisor_remote_get_direct() Christian Couder 2019-03-13 4:23 ` Junio C Hamano 2019-04-01 16:41 ` Christian Couder 2019-03-12 13:29 ` [PATCH v3 04/11] promisor-remote: add promisor_remote_reinit() Christian Couder 2019-03-13 4:28 ` Junio C Hamano 2019-04-01 16:41 ` Christian Couder 2019-03-12 13:29 ` [PATCH v3 05/11] promisor-remote: use repository_format_partial_clone Christian Couder 2019-03-13 4:31 ` Junio C Hamano 2019-04-01 16:42 ` Christian Couder 2019-04-01 17:25 ` Junio C Hamano 2019-03-12 13:29 ` [PATCH v3 06/11] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder 2019-03-12 13:29 ` [PATCH v3 07/11] promisor-remote: parse remote.*.partialclonefilter Christian Couder 2019-03-12 13:29 ` Christian Couder [this message] 2019-03-12 13:29 ` [PATCH v3 09/11] t0410: test fetching from many promisor remotes Christian Couder 2019-03-12 13:29 ` [PATCH v3 10/11] partial-clone: add multiple remotes in the doc Christian Couder 2019-03-12 13:29 ` [PATCH v3 11/11] remote: add promisor and partial clone config to " Christian Couder
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=20190312132959.11764-9-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=sbeller@google.com \ --cc=sunshine@sunshineco.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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git