user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] config: use NUL-delimited git-config(1) output
@ 2019-09-28 20:59 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-09-28 20:59 UTC (permalink / raw)
  To: meta

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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-28 20:59 [PATCH] config: use NUL-delimited git-config(1) output Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox