From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2009 05:51:49 +0000 (-0700)
Subject: Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
X-Git-Tag: v1.6.3~9^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54e0e6edfa60f84b582112804365e207e70f44a6?hp=41f64ad34b10697ceac68e3a3ad9df3baca9be34

Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

* rj/maint-1.6.0-svn-parse-fix:
git-svn: fix a sloppy Getopt::Long usage
---

diff --git a/git-svn.perl b/git-svn.perl
index 931d1a37bc..3b524207ff 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -144,7 +144,7 @@ BEGIN
 	           'dry-run|n' => \$_dry_run } ],
 	'set-tree' => [ \&cmd_set_tree,
 	                "Set an SVN repository to a git tree-ish",
-			{ 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
+			{ 'stdin' => \$_stdin, %cmt_opts, %fc_opts, } ],
 	'create-ignore' => [ \&cmd_create_ignore,
 			     'Create a .gitignore per svn:ignore',
 			     { 'revision|r=i' => \$_revision