Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2009 05:51:49 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2009 05:51:49 +0000 (22:51 -0700)
* rj/maint-1.6.0-svn-parse-fix:
  git-svn: fix a sloppy Getopt::Long usage

1  2 
git-svn.perl

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