[RFC] git-svn: allow --version to work anywhere

From

EWEric Wong <e@80x24.org>

Date

Jul 20, 2016, 00:47 UTC

Message-ID

<20160720004734.GA19635@whir>

Signed-off-by: Eric Wong <e@80x24.org>
---
  I'm hoping "cd /" in the test will always succeed;
  but I suppose non-*nix systems might fail, here.

  And maybe a BOFH did "chmod 700 /"	:(

  Anyways this is sitting in master of git://bogomips.org/git-svn.git

 git-svn.perl             | 4 ++--
 t/t9100-git-svn-basic.sh | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index f609e54..4d41d22 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');
 }
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 28082b1..10408d0 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -19,6 +19,14 @@ case "$GIT_SVN_LC_ALL" in
 	;;
 esac
 
+test_expect_success 'git svn --version works anywhere' '
+	( cd / || exit 0; git svn --version )
+'
+
+test_expect_success 'git svn help works anywhere' '
+	( cd / || exit 0; git svn help )
+'
+
 test_expect_success \
     'initialize git svn' '
 	mkdir import &&

-- 
EW