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>,
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 v4 08/11] builtin/fetch: remove unique promisor remote limitation
Date: Mon, 1 Apr 2019 18:40:42 +0200 [thread overview]
Message-ID: <20190401164045.17328-9-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190401164045.17328-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 13d8133130..5657d054ec 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.203.gd44fa53258
next prev parent reply other threads:[~2019-04-01 16:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 16:40 [PATCH v4 00/11] Many promisor remotes Christian Couder
2019-04-01 16:40 ` [PATCH v4 01/11] fetch-object: make functions return an error code Christian Couder
2019-04-01 16:40 ` [PATCH v4 02/11] Add initial support for many promisor remotes Christian Couder
2019-04-03 22:08 ` SZEDER Gábor
2019-04-04 8:02 ` Christian Couder
2019-04-01 16:40 ` [PATCH v4 03/11] promisor-remote: implement promisor_remote_get_direct() Christian Couder
2019-04-01 16:40 ` [PATCH v4 04/11] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-04-01 16:40 ` [PATCH v4 05/11] promisor-remote: use repository_format_partial_clone Christian Couder
2019-04-01 16:40 ` [PATCH v4 06/11] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-04-01 16:40 ` [PATCH v4 07/11] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-04-01 16:40 ` Christian Couder [this message]
2019-04-01 16:40 ` [PATCH v4 09/11] t0410: test fetching from many promisor remotes Christian Couder
2019-04-05 0:56 ` SZEDER Gábor
2019-04-01 16:40 ` [PATCH v4 10/11] partial-clone: add multiple remotes in the doc Christian Couder
2019-04-01 16:40 ` [PATCH v4 11/11] remote: add promisor and partial clone config to " Christian Couder
2019-04-04 7:23 ` [PATCH v4 00/11] Many promisor remotes Junio C Hamano
2019-04-04 7:59 ` Christian Couder
2019-04-05 20:07 ` Johannes Schindelin
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=20190401164045.17328-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=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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).