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

Marcus

Johannes Schindelin wrote:
quoted text
> We have a tradition that bare repositories live in directories ending
> in ".git".  To make this more a convention than just a tradition, teach=

quoted text
> "git clone --bare" to add a ".git" suffix to the directory name.
>=20
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>=20
> 	This patch is only conceptionally dependent on patch 1/2.
>=20
>  builtin-clone.c  |   10 ++++++++--
>  t/t5601-clone.sh |    7 +++++++
>  2 files changed, 15 insertions(+), 2 deletions(-)
>=20
> 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)
quoted text
>  	return NULL;
>  }
> =20
> -static char *guess_dir_name(const char *repo, int is_bundle)
> +static char *guess_dir_name(const char *repo, int is_bundle, int is_ba=
re)
quoted text
>  {
>  	const char *end =3D repo + strlen(repo), *start;
> =20
> @@ -131,6 +131,12 @@ static char *guess_dir_name(const char *repo, int =
is_bundle)
quoted text
>  			end -=3D 4;
>  	}
> =20
> +	if (is_bare) {
> +		char *result =3D xmalloc(end - start + 5);
> +		sprintf(result, "%.*s.git", (int)(end - start), start);
> +		return result;
> +	}
> +
>  	return xstrndup(start, end - start);
>  }
> =20
> @@ -388,7 +394,7 @@ int cmd_clone(int argc, const char **argv, const ch=
ar *prefix)
quoted text
>  	if (argc =3D=3D 2)
>  		dir =3D xstrdup(argv[1]);
>  	else
> -		dir =3D guess_dir_name(repo_name, is_bundle);
> +		dir =3D guess_dir_name(repo_name, is_bundle, option_bare);
> =20
>  	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' '
> =20
>  '
> =20
> +test_expect_success 'clone --bare names the local repository <name>.gi=
t' '
quoted text
> +
> +	git clone --bare src &&
> +	test -d src.git
> +
> +'
> +
>  test_done

--=20
Marcus Griep
GPG Key ID: 0x5E968152
=E2=80=94=E2=80=94
http://www.boohaunt.net
=D7=90=D7=AA.=CF=88=CE=BF=C2=B4