user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] config: use NUL-delimited git-config(1) output
Date: Sat, 28 Sep 2019 20:59:30 +0000	[thread overview]
Message-ID: <20190928205930.18417-1-e@80x24.org> (raw)

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!
---
 lib/PublicInbox/Config.pm | 6 +++---
 t/config.t                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index ef277c40..4fcb20d2 100644
--- 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 a4e76150..a3c74fa2 100644
--- 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");
 }
 
-- 
EW


                 reply	other threads:[~2019-09-28 20:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190928205930.18417-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).