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: http://git.tremily.us/?a=commitdiff_plain;h=54e0e6edfa60f84b582112804365e207e70f44a6;p=git.git

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
---

54e0e6edfa60f84b582112804365e207e70f44a6
diff --cc git-svn.perl
index 931d1a37b,8b9ad38f8..3b524207f
--- a/git-svn.perl
+++ b/git-svn.perl
@@@ -133,18 -131,9 +133,18 @@@ my %cmd = 
  			  'revision|r=i' => \$_revision,
  			  'no-rebase' => \$_no_rebase,
  			%cmt_opts, %fc_opts } ],
 +	branch => [ \&cmd_branch,
 +	            'Create a branch in the SVN repository',
 +	            { 'message|m=s' => \$_message,
 +	              'dry-run|n' => \$_dry_run,
 +		      'tag|t' => \$_tag } ],
 +	tag => [ sub { $_tag = 1; cmd_branch(@_) },
 +	         'Create a tag in the SVN repository',
 +	         { 'message|m=s' => \$_message,
 +	           '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