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>

diff --git a/builtin-clone.c b/builtin-clone.c
index ecdcefa2a6901a8c8eb0902845e40fea216d7249..8612d59dd22202bc8af3436bffcade2e2dba5fcf 100644 (file)
--- 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;
 }
 
        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)
                dir = xstrdup(argv[1]);
        else
        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);
 
        if (!stat(dir, &buf))
                die("destination directory '%s' already exists.", dir);

diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index a5334570ad4e944ac7c95e9b6c41bb96cb475c0c..57173b4c50ec5f30198c9bf8bd8d03edd17bb235 100755 (executable)
--- 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
 test_done