[PATCH] clone: fix options '-o' and '--origin' to be recognised again

[PATCH] clone: fix options '-o' and '--origin' to be recognised again

[Marco Roeland]

Due to a subtle typo in a shell case pattern neither alternative worked.

Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl>
---

 This is a regression in 'next', introduced on Nov 4th by commit 94362599
 "Migrate git-clone to use git-rev-parse --parseopt". Added Kristian as
 he works on the builtin version; perhaps nice for a test case (!).

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

diff --git a/git-clone.sh b/git-clone.sh
index 9a160ee..b4e858c 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -152,7 +152,7 @@ do
 		die "clones are always made with separate-remote layout" ;;
 	--reference)
 		shift; reference="$1" ;;
-	-o,--origin)
+	-o|--origin)
 		shift;
 		case "$1" in
 		'')
-- 
1.5.4.rc0.1162.g3bfea

Re: [PATCH] clone: fix options '-o' and '--origin' to be recognised again

[Junio C Hamano]

Thanks.  That indeed was embarrassing.

Re: [PATCH] clone: fix options '-o' and '--origin' to be recognised again

[Jeff King]

On Wed, Dec 19, 2007 at 10:15:15AM +0100, Marco Roeland wrote:

>  This is a regression in 'next', introduced on Nov 4th by commit 94362599
>  "Migrate git-clone to use git-rev-parse --parseopt". Added Kristian as
>  he works on the builtin version; perhaps nice for a test case (!).

Here is a test case that catches this regression. It can perhaps be
expanded by Kristian to test other options, but is probably worth adding
now as a basic sanity check.

I put the test in 5702. There seems to be a '5600' clone test, as well,
which perhaps should be in the 57?? series.

-- >8 --
test "git clone -o"

This tests a recently fixed regression in which "git clone
-o" didn't work at all.

Signed-off-by: Jeff King <peff@peff.net>
---
 t/t5702-clone-options.sh |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100755 t/t5702-clone-options.sh

diff --git a/t/t5702-clone-options.sh b/t/t5702-clone-options.sh
new file mode 100755
index 0000000..328e4d9
--- /dev/null
+++ b/t/t5702-clone-options.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_description='basic clone options'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file &&
+	 git commit -m one)
+
+'
+
+test_expect_success 'clone -o' '
+
+	git clone -o foo parent clone-o &&
+	(cd clone-o && git rev-parse --verify refs/remotes/foo/master)
+
+'
+
+test_done
-- 
1.5.4.rc0.1162.gaa83ae