From: Andreas Rottmann <mail@r0tty.org>
Date: Sun, 29 Mar 2020 11:12:50 +0000 (+0200)
Subject: config: Honor gitconfig includes
X-Git-Tag: v1.4.0~48
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=6d6c6d27dd3ecafd523962dff2170d48a71680cf

config: Honor gitconfig includes

This allows for a setup where a central config file for the web server
includes per-user config files.
---

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 2d663515..917939ca 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -156,7 +156,7 @@ sub config_fh_parse ($$$) {
 sub git_config_dump {
 	my ($file) = @_;
 	return {} unless -e $file;
-	my @cmd = (qw/git config -z -l/, "--file=$file");
+	my @cmd = (qw/git config -z -l --includes/, "--file=$file");
 	my $cmd = join(' ', @cmd);
 	my $fh = popen_rd(\@cmd);
 	my $rv = config_fh_parse($fh, "\0", "\n");