All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	"SZEDER Gábor" <szeder.dev@gmail.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Derrick Stolee" <stolee@gmail.com>
Subject: [PATCH v6 09/15] builtin/fetch: remove unique promisor remote limitation
Date: Tue, 25 Jun 2019 15:40:33 +0200	[thread overview]
Message-ID: <20190625134039.21707-10-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190625134039.21707-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.22.0.229.ga13d9ffdf7.dirty


  parent reply	other threads:[~2019-06-25 13:41 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-25 13:40 [PATCH v6 00/15] Many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 01/15] t0410: remove pipes after git commands Christian Couder
2019-06-25 13:40 ` [PATCH v6 02/15] fetch-object: make functions return an error code Christian Couder
2019-06-25 13:40 ` [PATCH v6 03/15] Add initial support for many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 04/15] promisor-remote: implement promisor_remote_get_direct() Christian Couder
2019-06-25 13:40 ` [PATCH v6 05/15] promisor-remote: add promisor_remote_reinit() Christian Couder
2019-06-25 13:40 ` [PATCH v6 06/15] promisor-remote: use repository_format_partial_clone Christian Couder
2019-06-25 13:40 ` [PATCH v6 07/15] Use promisor_remote_get_direct() and has_promisor_remote() Christian Couder
2019-06-25 13:40 ` [PATCH v6 08/15] promisor-remote: parse remote.*.partialclonefilter Christian Couder
2019-06-25 13:40 ` Christian Couder [this message]
2019-06-25 13:40 ` [PATCH v6 10/15] t0410: test fetching from many promisor remotes Christian Couder
2019-06-25 13:40 ` [PATCH v6 11/15] partial-clone: add multiple remotes in the doc Christian Couder
2019-06-25 13:40 ` [PATCH v6 12/15] remote: add promisor and partial clone config to " Christian Couder
2019-06-25 13:40 ` [PATCH v6 13/15] Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} Christian Couder
2019-06-25 13:40 ` [PATCH v6 14/15] Move repository_format_partial_clone to promisor-remote.c Christian Couder
2019-06-25 13:40 ` [PATCH v6 15/15] Move core_partial_clone_filter_default " 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190625134039.21707-10-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=ramsay@ramsayjones.plus.com \
    --cc=stolee@gmail.com \
    --cc=sunshine@sunshineco.com \
    --cc=szeder.dev@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.