summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-04-04 00:41:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-04 07:09:47 (GMT)
commitfc9957b0052df6a8248420395bc9febd66194252 (patch)
treee9be365c704baf27dcb9c70cbad75e100c549d94
parent5f2f4240022418e9a75505f11298db54a5da12d2 (diff)
downloadgit-fc9957b0052df6a8248420395bc9febd66194252.zip
git-fc9957b0052df6a8248420395bc9febd66194252.tar.gz
git-fc9957b0052df6a8248420395bc9febd66194252.tar.bz2
contrib/git-svn: handle array values correctly
Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xcontrib/git-svn/git-svn.perl5
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index e7fff46..7c44450 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;
}