[PATCH] Fix clone to setup the origin if its name ends with .git

[PATCH] Fix clone to setup the origin if its name ends with .git

[Alex Riesen]

The problem is visible when cloning a local repo. The cloned
repository will have the origin url setup incorrectly: the origin name
will be copied verbatim in origin url of the cloned repository.
Normally, the name is to be expanded into absolute path.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 git-clone.sh           |    2 +-
 t/t5701-clone-local.sh |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100755 t/t5701-clone-local.sh

diff --git a/git-clone.sh b/git-clone.sh
index fdd354f..d45618d 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -20,7 +20,7 @@ usage() {
 get_repo_base() {
 	(
 		cd "`/bin/pwd`" &&
-		cd "$1" &&
+		cd "$1" || cd "$1.git" &&
 		{
 			cd .git
 			pwd
diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
new file mode 100755
index 0000000..fb027f3
--- /dev/null
+++ b/t/t5701-clone-local.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+test_description='test local clone'
+. ./test-lib.sh
+
+test_expect_success 'preparing origin repository' \
+':>file && git add . && git commit -m1 && mv .git a.git'
+
+unset GIT_CONFIG
+
+test_expect_success 'local clone without .git suffix' \
+'git clone -l -s a b && cd b && git fetch && cd ..'
+
+test_expect_success 'local clone with .git suffix' \
+'git clone -l -s a.git c && cd c && git fetch && cd ..'
+
+test_done
-- 
1.5.2.1.141.g3c63

Re: [PATCH] Fix clone to setup the origin if its name ends with .git

[Junio C Hamano]

Alex Riesen <raa.lkml@gmail.com> writes:

> The problem is visible when cloning a local repo. The cloned
> repository will have the origin url setup incorrectly: the origin name
> will be copied verbatim in origin url of the cloned repository.
> Normally, the name is to be expanded into absolute path.

Thanks.

> diff --git a/git-clone.sh b/git-clone.sh
> index fdd354f..d45618d 100755
> --- a/git-clone.sh
> +++ b/git-clone.sh
> @@ -20,7 +20,7 @@ usage() {
>  get_repo_base() {
>  	(
>  		cd "`/bin/pwd`" &&
> -		cd "$1" &&
> +		cd "$1" || cd "$1.git" &&
>  		{
>  			cd .git
>  			pwd

We would probably need a to clean up this test a bit, though.
When we write our tests, we tend to forget testing the cases
where things ought to fail.

I'll probably redo the test myself, but for the record...

 - Please never "unset" GIT_CONFIG.  We do not want the tests to
   get affected with /etc/gitconfig or $HOME/.gitconfig;

 - We would also want to test the cases where a bare repository
   x exists and x.git does not, and try cloning it into y and z
   respectively.  Obviously the former should work and the
   latter should fail.