undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use local cloning if insteadOf makes a local URL

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Barabanov 2014-07-17 00:09:32 -07:00 committed by Junio C Hamano
parent f2c9f21369
commit f38aa83f9a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/clone.c
View File

@ -799,18 +799,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
die(_("repository '%s' does not exist"), repo_name); die(_("repository '%s' does not exist"), repo_name);
else else
repo = repo_name; 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 */ /* no need to be strict, transport_set_option() will validate it again */
if (option_depth && atoi(option_depth) < 1) 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); remote = remote_get(option_origin);
transport = transport_get(remote, remote->url[0]); 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; transport->cloning = 1;
if (!transport->get_refs_list || (!is_local && !transport->fetch)) if (!transport->get_refs_list || (!is_local && !transport->fetch))