public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Michael Barabanov <michael.barabanov@windriver•com>
Cc: <git@vger•kernel.org>
Subject: Re: [PATCH] use local cloning if insteadOf makes a local URL
Date: Thu, 17 Jul 2014 10:23:24 -0700	[thread overview]
Message-ID: <xmqqwqbbq4qb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1405580972-26078-1-git-send-email-michael.barabanov@windriver.com> (Michael Barabanov's message of "Thu, 17 Jul 2014 00:09:32 -0700")

Michael Barabanov <michael.barabanov@windriver•com> writes:
> Move the is_local logic to the place where origin remote has been setup and
> check if the remote url can be used to do local cloning.
>
> This saves a lot of space (and time) in some of the mirroring scenarios that
> involve insteadOf rewrites.
>
> Signed-off-by: Michael Barabanov <michael.barabanov@windriver•com>
> ---

Strictly speaking, this change introduces a regression to those who
would rather use --no-local if they knew the are cloning from a
local copy, but they can rewrite their insteadOf to use file:// URL
as a workaround.

The code change looked OK from a cursory read, modulo possibly
introducing a new memory leak on the old value of "path" (I didn't
check carefully).

Thanks.

>  builtin/clone.c | 25 +++++++++++++------------
>  1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/builtin/clone.c b/builtin/clone.c
> index f0dabec..bbd169c 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -799,18 +799,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
>  		die(_("repository '%s' does not exist"), repo_name);
>  	else
>  		repo = repo_name;
> -	is_local = option_local != 0 && path && !is_bundle;
> -	if (is_local) {
> -		if (option_depth)
> -			warning(_("--depth is ignored in local clones; use file:// instead."));
> -		if (!access(mkpath("%s/shallow", path), F_OK)) {
> -			if (option_local > 0)
> -				warning(_("source repository is shallow, ignoring --local"));
> -			is_local = 0;
> -		}
> -	}
> -	if (option_local > 0 && !is_local)
> -		warning(_("--local is ignored"));
>  
>  	/* no need to be strict, transport_set_option() will validate it again */
>  	if (option_depth && atoi(option_depth) < 1)
> @@ -903,6 +891,19 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
>  
>  	remote = remote_get(option_origin);
>  	transport = transport_get(remote, remote->url[0]);
> +	path = get_repo_path(remote->url[0], &is_bundle);
> +	is_local = option_local != 0 && path && !is_bundle;
> +	if (is_local) {
> +		if (option_depth)
> +			warning(_("--depth is ignored in local clones; use file:// instead."));
> +		if (!access(mkpath("%s/shallow", path), F_OK)) {
> +			if (option_local > 0)
> +				warning(_("source repository is shallow, ignoring --local"));
> +			is_local = 0;
> +		}
> +	}
> +	if (option_local > 0 && !is_local)
> +		warning(_("--local is ignored"));
>  	transport->cloning = 1;
>  
>  	if (!transport->get_refs_list || (!is_local && !transport->fetch))

next prev parent reply	other threads:[~2014-07-17 17:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-17  7:09 [PATCH] use local cloning if insteadOf makes a local URL Michael Barabanov
2014-07-17 17:23 ` Junio C Hamano [this message]
2014-07-17 18:41   ` Michael Barabanov

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=xmqqwqbbq4qb.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=michael.barabanov@windriver$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox