config: use NUL-delimited git-config(1) output

This allows us to deal with newlines in config values,
since git-config(1) acquired "-z" support in git v1.5.3.

I'm not sure if it's actually useful in our case, but
maybe some multi-line texts could be added.  And newlines
in path names are super useful!

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ef277c40a55e14c9719a07ecf9546e9c94edd4ef..4fcb20d24437dee77aeb1bdf6e1ecc6f92c9466d 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -151,14 +151,14 @@ sub git_config_dump {
        my ($file) = @_;
        my (%section_seen, @section_order);
        return {} unless -e $file;
-       my @cmd = (qw/git config/, "--file=$file", '-l');
+       my @cmd = (qw/git config -z -l/, "--file=$file");
        my $cmd = join(' ', @cmd);
        my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
        my %rv;
-       local $/ = "\n";
+       local $/ = "\0";
        while (defined(my $line = <$fh>)) {
                chomp $line;
-               my ($k, $v) = split(/=/, $line, 2);
+               my ($k, $v) = split(/\n/, $line, 2);
 
                my ($section) = ($k =~ /\A(\S+)\.[^\.]+\z/);
                unless (defined $section_seen{$section}) {

diff --git a/t/config.t b/t/config.t
index a4e761500455bfd306c44d3efa626987fc550bbb..a3c74fa2584771f02ffa5c21353471f32df13e66 100644 (file)
--- a/t/config.t
+++ b/t/config.t
@@ -9,12 +9,12 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 
 {
        is(system(qw(git init -q --bare), $tmpdir), 0, "git init successful");
-       my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar hihi));
+       my @cmd = ('git', "--git-dir=$tmpdir", qw(config foo.bar), "hi\nhi");
        is(system(@cmd), 0, "set config");
 
        my $tmp = PublicInbox::Config->new("$tmpdir/config");
 
-       is("hihi", $tmp->{"foo.bar"}, "config read correctly");
+       is("hi\nhi", $tmp->{"foo.bar"}, "config read correctly");
        is("true", $tmp->{"core.bare"}, "used --bare repo");
 }