watchmaildir: support multiple watchheader values

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index e0ca7c5a0d643e07826d7f8a58ab479d6835e817..458f29b2964d32c592f0e33d9c060216efb6aee7 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used throughout the project for reading configuration
@@ -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");
@@ -367,7 +367,7 @@ sub _fill {
        my $ibx = {};
 
        foreach my $k (qw(inboxdir filter newsgroup
-                       watch watchheader httpbackendmax
+                       watch httpbackendmax
                        replyto feedmax nntpserver indexlevel)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
@@ -388,7 +388,7 @@ sub _fill {
        # TODO: more arrays, we should support multi-value for
        # more things to encourage decentralization
        foreach my $k (qw(address altid nntpmirror coderepo hide listid url
-                       infourl)) {
+                       infourl watchheader)) {
                if (defined(my $v = $self->{"$pfx.$k"})) {
                        $ibx->{$k} = _array($v);
                }