diff options
| -rw-r--r-- | builtin-clone.c | 10 | ||||
| -rwxr-xr-x | t/t5601-clone.sh | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index ecdcefa2a6..8612d59dd2 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -95,7 +95,7 @@ static char *get_repo_path(const char *repo, int *is_bundle) 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; @@ -131,6 +131,12 @@ static char *guess_dir_name(const char *repo, int is_bundle) 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); } @@ -389,7 +395,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (argc == 2) dir = xstrdup(argv[1]); else - dir = guess_dir_name(repo_name, is_bundle); + dir = guess_dir_name(repo_name, is_bundle, option_bare); if (!stat(dir, &buf)) die("destination directory '%s' already exists.", dir); diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index a5334570ad..57173b4c50 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -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 |