From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 4 Apr 2006 00:41:44 +0000 (-0700)
Subject: contrib/git-svn: handle array values correctly
X-Git-Tag: v1.3.0-rc2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fc9957b0052df6a8248420395bc9febd66194252;p=git.git

contrib/git-svn: handle array values correctly

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index e7fff46d2..7c44450d7 100755
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -75,12 +75,11 @@ foreach my $o (keys %opts) {
 	my $arg = 'git-repo-config';
 	$arg .= ' --int' if ($o =~ /=i$/);
 	$arg .= ' --bool' if ($o !~ /=[sfi]$/);
-	$arg .= " svn.$key"; # $key only matches [a-z\-], always shell-safe
 	if (ref $v eq 'ARRAY') {
-		chomp(my @tmp = `$arg`);
+		chomp(my @tmp = `$arg --get-all svn.$key`);
 		@$v = @tmp if @tmp;
 	} else {
-		chomp(my $tmp = `$arg`);
+		chomp(my $tmp = `$arg --get svn.$key`);
 		if ($tmp && !($arg =~ / --bool / && $tmp eq 'false')) {
 			$$v = $tmp;
 		}