[PATCH] config: Honor gitconfig includes

[PATCH] config: Honor gitconfig includes

[Andreas Rottmann]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: [PATCH] config: Honor gitconfig includes --]
[-- Type: text/x-patch, Size: 900 bytes --]

From 90b0eda357905d1940de51c2d830cee477a87394 Mon Sep 17 00:00:00 2001
From: Andreas Rottmann <mail@r0tty.org>
Date: Sun, 29 Mar 2020 12:29:41 +0200
Subject: [PATCH] config: Honor gitconfig includes

This allows for a setup where a central config file for the web server
includes per-user config files.
---
 lib/PublicInbox/Config.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
-- 
2.25.1

Re: [PATCH] config: Honor gitconfig includes

[Eric Wong]

Andreas Rottmann <mail@r0tty.org> wrote:
> From 90b0eda357905d1940de51c2d830cee477a87394 Mon Sep 17 00:00:00 2001
> From: Andreas Rottmann <mail@r0tty.org>
> Date: Sun, 29 Mar 2020 12:29:41 +0200
> Subject: [PATCH] config: Honor gitconfig includes

Thanks Andreas!

For future reference (for this project, git.git, linux.git,
etc...), there's no need to include the above lines unless
they differ from what's in the headers.

And if they do differ, the "From " line isn't necessary and
"--8<--" can be used for "git am --scissors" compatibility :>


Most everything else looks good and pushed to master as
commit 6d6c6d27dd3ecafd523962dff2170d48a71680cf

Thanks again.