Browse Source

git-svn: allow --version to work anywhere

Checking the version of the installed SVN libraries should not
require a git repository at all.  This matches the behavior of
"git --version".

Add a test for "git svn help" for the same behavior while we're
at it, too.

Signed-off-by: Eric Wong <e@80x24.org>
maint
Eric Wong 9 years ago
parent
commit
c0071ae5dc
  1. 4
      git-svn.perl
  2. 19
      t/t9100-git-svn-basic.sh

4
git-svn.perl

@ -339,7 +339,7 @@ if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { @@ -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)$/) { @@ -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');
}

19
t/t9100-git-svn-basic.sh

@ -19,6 +19,25 @@ case "$GIT_SVN_LC_ALL" in @@ -19,6 +19,25 @@ case "$GIT_SVN_LC_ALL" in
;;
esac

deepdir=nothing-above
ceiling=$PWD

test_expect_success 'git svn --version works anywhere' '
mkdir -p "$deepdir" && (
export GIT_CEILING_DIRECTORIES="$ceiling" &&
cd "$deepdir" &&
git svn --version
)
'

test_expect_success 'git svn help works anywhere' '
mkdir -p "$deepdir" && (
export GIT_CEILING_DIRECTORIES="$ceiling" &&
cd "$deepdir" &&
git svn help
)
'

test_expect_success \
'initialize git svn' '
mkdir import &&

Loading…
Cancel
Save