From: Andreas Rottmann <mail@r0tty.org>
To: meta@public-inbox.org
Subject: [PATCH] config: Honor gitconfig includes
Date: Sun, 29 Mar 2020 13:12:50 +0200 [thread overview]
Message-ID: <87imin8le5.fsf@r0tty.org> (raw)
[-- 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
next reply other threads:[~2020-03-29 11:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-29 11:12 Andreas Rottmann [this message]
2020-03-29 17:53 ` [PATCH] config: Honor gitconfig includes Eric Wong
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: http://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=87imin8le5.fsf@r0tty.org \
--to=mail@r0tty.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).