clone --bare: Add ".git" suffix to the directory name to clone into
We have a tradition that bare repositories live in directories ending in ".git". To make this more a convention than just a tradition, teach "git clone --bare" to add a ".git" suffix to the directory name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
807d869453
commit
6612f877cc
@ -95,7 +95,7 @@ static char *get_repo_path(const char *repo, int *is_bundle)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *guess_dir_name(const char *repo, int is_bundle)
|
static char *guess_dir_name(const char *repo, int is_bundle, int is_bare)
|
||||||
{
|
{
|
||||||
const char *end = repo + strlen(repo), *start;
|
const char *end = repo + strlen(repo), *start;
|
||||||
|
|
||||||
@ -131,6 +131,12 @@ static char *guess_dir_name(const char *repo, int is_bundle)
|
|||||||
end -= 4;
|
end -= 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (is_bare) {
|
||||||
|
char *result = xmalloc(end - start + 5);
|
||||||
|
sprintf(result, "%.*s.git", (int)(end - start), start);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
return xstrndup(start, end - start);
|
return xstrndup(start, end - start);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -389,7 +395,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
|
|||||||
if (argc == 2)
|
if (argc == 2)
|
||||||
dir = xstrdup(argv[1]);
|
dir = xstrdup(argv[1]);
|
||||||
else
|
else
|
||||||
dir = guess_dir_name(repo_name, is_bundle);
|
dir = guess_dir_name(repo_name, is_bundle, option_bare);
|
||||||
|
|
||||||
if (!stat(dir, &buf))
|
if (!stat(dir, &buf))
|
||||||
die("destination directory '%s' already exists.", dir);
|
die("destination directory '%s' already exists.", dir);
|
||||||
|
@ -82,4 +82,11 @@ test_expect_success 'clone --mirror' '
|
|||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'clone --bare names the local repository <name>.git' '
|
||||||
|
|
||||||
|
git clone --bare src &&
|
||||||
|
test -d src.git
|
||||||
|
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user