diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-07-28 13:13:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-28 13:13:53 -0700 |
| commit | 0f3d855efc2f8104bb3e168dd3f74bc84e0d2d45 (patch) | |
| tree | 32ec37cc330d9528778f0403756ed06158251a5f /git-svn.perl | |
| parent | Merge branch 'sb/submodule-deinit-all' (diff) | |
| parent | git-svn: allow --version to work anywhere (diff) | |
| download | tgif-0f3d855efc2f8104bb3e168dd3f74bc84e0d2d45.tar.xz | |
Merge branch 'master' of git://git.bogomips.org/git-svn
* 'master' of git://git.bogomips.org/git-svn:
git-svn: allow --version to work anywhere
git-svn: document svn.authorsProg in config
Diffstat (limited to 'git-svn.perl')
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index f609e54ce3..4d41d220a0 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -339,7 +339,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { die "failed to open $ENV{GIT_DIR}: $!\n"; $ENV{GIT_DIR} = $1 if <$fh> =~ /^gitdir: (.+)$/; } -} else { +} elsif ($cmd) { my ($git_dir, $cdup); git_cmd_try { $git_dir = command_oneline([qw/rev-parse --git-dir/]); @@ -356,7 +356,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { my %opts = %{$cmd{$cmd}->[2]} if (defined $cmd); -read_git_config(\%opts); +read_git_config(\%opts) if $ENV{GIT_DIR}; if ($cmd && ($cmd eq 'log' || $cmd eq 'blame')) { Getopt::Long::Configure('pass_through'); } |