@matheusbsbs / matheus-bagliano / commits / 6f0783cf94
Fork 0

contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch

I ended up using GIT_SVN_ID far more than I ever thought I would. Typing less is good. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>

Eric Wong committed Mar 3, 2006 at 01:20 UTC 6f0783cf9473feaaadf2ebc59167f84f0b1172bd
1 file changed +11 -8
contrib/git-svn/git-svn.perl
+11 -8
@@ -10,13 +10,6 @@ use vars qw/ $AUTHOR $VERSION
10 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
11 $VERSION = '0.10.0';
12 $GIT_DIR = $ENV{GIT_DIR} || "$ENV{PWD}/.git";
13 -$GIT_SVN = $ENV{GIT_SVN_ID} || 'git-svn';
14 -$GIT_SVN_INDEX = "$GIT_DIR/$GIT_SVN/index";
15 -$ENV{GIT_DIR} ||= $GIT_DIR;
16 -$SVN_URL = undef;
17 -$REV_DIR = "$GIT_DIR/$GIT_SVN/revs";
18 -$SVN_WC = "$GIT_DIR/$GIT_SVN/tree";
19 -
13 # make sure the svn binary gives consistent output between locales and TZs:
14 $ENV{TZ} = 'UTC';
15 $ENV{LC_ALL} = 'C';
@@ -78,7 +71,17 @@ foreach (keys %cmd) {
71 my %opts;
72 %opts = %{$cmd{$cmd}->[2]} if (defined $cmd);
73
81 -GetOptions(%opts, 'help|H|h' => \$_help, 'version|V' => \$_version ) or exit 1;
74 +GetOptions(%opts, 'help|H|h' => \$_help,
75 + 'version|V' => \$_version,
76 + 'id|i=s' => \$GIT_SVN) or exit 1;
77 +
78 +$GIT_SVN ||= $ENV{GIT_SVN_ID} || 'git-svn';
79 +$GIT_SVN_INDEX = "$GIT_DIR/$GIT_SVN/index";
80 +$ENV{GIT_DIR} ||= $GIT_DIR;
81 +$SVN_URL = undef;
82 +$REV_DIR = "$GIT_DIR/$GIT_SVN/revs";
83 +$SVN_WC = "$GIT_DIR/$GIT_SVN/tree";
84 +
85 usage(0) if $_help;
86 version() if $_version;
87 usage(1) unless defined $cmd;