From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS39878 185.33.8.0/22 X-Spam-Status: No, score=-3.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from ghost.xx.vu (ghost.xx.vu [185.33.11.101]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 72C751F487 for ; Sun, 29 Mar 2020 11:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=r0tty.org; s=20200309; t=1585480374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=2ZKZhtdtr4ArAUwhOVlCshSULA4RrVQMo8DWnX+LjX8=; b=LCbagTK/ww4BsgrQLmu9X6X065EkJm6F9h84S3NDHnaJgXYxhD7qeKQ8xRAYu4G0qVFZkl 3xbQGi661VrOZCdBllDwzkAyNYQndoi3VeNfPP0pA2NrQYKxmNJTBbCTEAfFDzAustCq4k i2GRxqYWdwqzLYmLUvZow8SowRQb/iM= Received: from mail0.xx.vu (localhost [::1]) by ghost.xx.vu (OpenSMTPD) with ESMTP id 29bdc3cf for ; Sun, 29 Mar 2020 11:12:54 +0000 (UTC) Received: from londo ([46.125.250.81]) by mail0.xx.vu with ESMTPSA id XQXMLbaCgF5xNwEAg/rtjg (envelope-from ) for ; Sun, 29 Mar 2020 11:12:54 +0000 From: Andreas Rottmann To: meta@public-inbox.org Subject: [PATCH] config: Honor gitconfig includes Date: Sun, 29 Mar 2020 13:12:50 +0200 Message-ID: <87imin8le5.fsf@r0tty.org> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=0001-config-Honor-gitconfig-includes.patch Content-Description: [PATCH] config: Honor gitconfig includes List-Id: >From 90b0eda357905d1940de51c2d830cee477a87394 Mon Sep 17 00:00:00 2001 From: Andreas Rottmann 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