Merge early part of 'jc/combine' branch

diff --git a/contrib/git-svn/git-svn.perl b/contrib/git-svn/git-svn.perl
index e7fff46d22df50f9c7a43e08f458eb34cd14148e..7c44450d72021a91069697826227922a841cd472 100755 (executable)
--- a/contrib/git-svn/git-svn.perl
+++ b/contrib/git-svn/git-svn.perl
@@ -75,12 +75,11 @@
        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;
                }