Re: [PATCH 2/2] clone --bare: Add ".git" suffix to the directory name to clone into

[Marcus Griep <marcus@griep.us>]

[-- Attachment #1: Type: text/plain, Size: 2213 bytes --]

Does this patch forgo adding a ".git" suffix if one is already present?

Marcus

Johannes Schindelin wrote:
> 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>
> ---
> 
> 	This patch is only conceptionally dependent on patch 1/2.
> 
>  builtin-clone.c  |   10 ++++++++--
>  t/t5601-clone.sh |    7 +++++++
>  2 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin-clone.c b/builtin-clone.c
> index a45179c..82f5b67 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);
>  }
>  
> @@ -388,7 +394,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 4b2533f..e0a68ab 100755
> --- a/t/t5601-clone.sh
> +++ b/t/t5601-clone.sh
> @@ -80,4 +80,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

-- 
Marcus Griep
GPG Key ID: 0x5E968152
——
http://www.boohaunt.net
את.ψο´


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 793 bytes --]