[PATCH] clone: detect and fail on excess parameters

[PATCH] clone: detect and fail on excess parameters

[Junio C Hamano]

"git clone [options] $src $dst excess-garbage" simply ignored
excess-garbage without giving any diagnostic message.  Fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * I noticed it while trying "git clone --reference $there $src $dst" with
   various combinations of options, and in one case I errorneously removed
   "--reference" without removing $there.  It happily created a clone of
   the reference repository under a funnily named directory whose name
   looked like a URL.

 git-clone.sh     |    1 +
 t/t5601-clone.sh |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/git-clone.sh b/git-clone.sh
index 2636159..9e433c0 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -219,6 +219,7 @@ fi
 if test -n "$2"
 then
 	dir="$2"
+	test $# == 2 || die "excess parameter to git-clone"
 else
 	# Derive one from the repository name
 	# Try using "humanish" part of source repo if user didn't specify one
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
new file mode 100755
index 0000000..dc9d63d
--- /dev/null
+++ b/t/t5601-clone.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+test_description=clone
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+	rm -fr .git &&
+	test_create_repo src &&
+	(
+		cd src
+		>file
+		git add file
+		git commit -m initial
+	)
+
+'
+
+test_expect_success 'clone with excess parameters' '
+
+	test_must_fail git clone -n "file://$(pwd)/src" dst junk
+
+'
+
+test_done

Re: [PATCH] clone: detect and fail on excess parameters

[SZEDER Gábor]

Hi,

On Wed, Apr 23, 2008 at 10:53:47AM -0700, Junio C Hamano wrote:
> "git clone [options] $src $dst excess-garbage" simply ignored
> excess-garbage without giving any diagnostic message.  Fix it.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> [...]
> --- a/git-clone.sh
> +++ b/git-clone.sh
> @@ -219,6 +219,7 @@ fi
>  if test -n "$2"
>  then
>  	dir="$2"
> +	test $# == 2 || die "excess parameter to git-clone"
                ^^
I think you mean:

    test $# = 2 || die "excess parameter to git-clone"

I just noticed because it broke t1020-subdirectory at me.


Best,
Gábor

[PATCH] Use "=" instead of "==" in condition as it is more portable

[Alex Riesen]

At least the dash from Ubuntu's /bin/sh says:

    test: 233: ==: unexpected operator

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
SZEDER Gábor, Mon, Apr 28, 2008 18:36:42 +0200:
> On Wed, Apr 23, 2008 at 10:53:47AM -0700, Junio C Hamano wrote:
> > "git clone [options] $src $dst excess-garbage" simply ignored
> > excess-garbage without giving any diagnostic message.  Fix it.
> > 
> >  	dir="$2"
> > +	test $# == 2 || die "excess parameter to git-clone"
>                 ^^
> I think you mean:
> 
>     test $# = 2 || die "excess parameter to git-clone"
> 
> I just noticed because it broke t1020-subdirectory at me.

And me. Almost every test which uses git-clone (I expect some don't
test its exit code in setup routines).

 git-clone.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-clone.sh b/git-clone.sh
index 9e433c0..8c7fc7f 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -219,7 +219,7 @@ fi
 if test -n "$2"
 then
 	dir="$2"
-	test $# == 2 || die "excess parameter to git-clone"
+	test $# = 2 || die "excess parameter to git-clone"
 else
 	# Derive one from the repository name
 	# Try using "humanish" part of source repo if user didn't specify one
-- 
1.5.5.1.118.g6dd1b6.dirty