From patchwork Fri Apr 9 13:43:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12194213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E369C43461 for ; Fri, 9 Apr 2021 13:43:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 333AC610D1 for ; Fri, 9 Apr 2021 13:43:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233527AbhDINnm (ORCPT ); Fri, 9 Apr 2021 09:43:42 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:51323 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233734AbhDINnl (ORCPT ); Fri, 9 Apr 2021 09:43:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DE4AF5C00A8; Fri, 9 Apr 2021 09:43:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 09 Apr 2021 09:43:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=sqZfY6zP54LdSHfMdBstCPdC7a1 f8Q4xPhQeZXvxQx0=; b=g33iKOMLHXar3TbTsrdP5uwtdPYQJu5VWdNULH9kcdH tmb1c8n0K2YYQv+cMcDBRkGqXHt1h/uCtluPCg2ZCqYhZZdbiWTZEPaF3rv54z7r I4LZ89o9NhlWZeCW0zhl97mJj91RcuLORlODGw8v5o0PJYYLDgXfNwu6NaceGU7f yRZTl5NrcbRleeBjuyUQyLYWGIJW/VsUOdawebGpocLbxZzXPjIBD0igkARf8IsX A18cCFOvNABIcrc/95ul5kYmUh0Lx6AHFFYBAh+Oj8xjNwzAva05sBfh8mIUJqwF kfdEUY9CwP6FXPR2U0GxLiokEVs6CA37ATASDUUoRng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=sqZfY6 zP54LdSHfMdBstCPdC7a1f8Q4xPhQeZXvxQx0=; b=BvLUe5h7a9kk9SG2GJgMwZ +j2Pq2lUKeLcMCpRPIU3iIpLp+8zAttCrsZqt9EB9Y+GvWDywxHfmEVHnSeLSbld qNJaE2EgppXYtPZpaQw8Mi6ugnhkLtpC9ejpsivQ4mWBndPwosa3BdIEMQm2iWSx 2zHBexheWBKOvCST/gIYYQntCSlAFLdNQ5Gip3Lk13SgyNK/DWbNlPycbgNLcIsZ aRA1mE2pI/+N3jdIj1sI853+/KfFBhoH6OL3xSyyzOcfLMQapbr6w4F/JNTP96Q1 N/nFotw2PyYBKwyGS+HFN5wknSsxWw/EvSIU4sLzfSoQwv8pF7IsUJHoM93xFvtw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrdduledurdekrdduieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x4dbf08a9.dyn.telefonica.de [77.191.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 275D6240057; Fri, 9 Apr 2021 09:43:27 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 8eff4ef9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Apr 2021 13:43:22 +0000 (UTC) Date: Fri, 9 Apr 2021 15:43:21 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?iso-8859-1?q?=C6var_Arnfj=F6r=F0?= Bjarmason , Eric Sunshine Subject: [PATCH v2 1/3] config: rename `git_etc_config()` Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The `git_etc_gitconfig()` function retrieves the system-level path of the configuration file. We're about to introduce a way to override it via an environment variable, at which point the name of this function would start to become misleading. Rename the function to `git_system_config()` as a preparatory step. Signed-off-by: Patrick Steinhardt --- builtin/config.c | 2 +- config.c | 6 +++--- config.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index f71fa39b38..02ed0b3fe7 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -695,7 +695,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) } } else if (use_system_config) { - given_config_source.file = git_etc_gitconfig(); + given_config_source.file = git_system_config(); given_config_source.scope = CONFIG_SCOPE_SYSTEM; } else if (use_local_config) { given_config_source.file = git_pathdup("config"); diff --git a/config.c b/config.c index 6428393a41..c552ab4ad9 100644 --- a/config.c +++ b/config.c @@ -1844,7 +1844,7 @@ static int git_config_from_blob_ref(config_fn_t fn, return git_config_from_blob_oid(fn, name, &oid, data); } -const char *git_etc_gitconfig(void) +const char *git_system_config(void) { static const char *system_wide; if (!system_wide) @@ -1896,10 +1896,10 @@ static int do_git_config_sequence(const struct config_options *opts, repo_config = NULL; current_parsing_scope = CONFIG_SCOPE_SYSTEM; - if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, + if (git_config_system() && !access_or_die(git_system_config(), R_OK, opts->system_gently ? ACCESS_EACCES_OK : 0)) - ret += git_config_from_file(fn, git_etc_gitconfig(), + ret += git_config_from_file(fn, git_system_config(), data); current_parsing_scope = CONFIG_SCOPE_GLOBAL; diff --git a/config.h b/config.h index 19a9adbaa9..8e8376ae19 100644 --- a/config.h +++ b/config.h @@ -318,7 +318,6 @@ int git_config_rename_section(const char *, const char *); int git_config_rename_section_in_file(const char *, const char *, const char *); int git_config_copy_section(const char *, const char *); int git_config_copy_section_in_file(const char *, const char *, const char *); -const char *git_etc_gitconfig(void); int git_env_bool(const char *, int); unsigned long git_env_ulong(const char *, unsigned long); int git_config_system(void); @@ -327,6 +326,8 @@ int config_error_nonbool(const char *); #define config_error_nonbool(s) (config_error_nonbool(s), const_error()) #endif +const char *git_system_config(void); + int git_config_parse_parameter(const char *, config_fn_t fn, void *data); enum config_scope current_config_scope(void); From patchwork Fri Apr 9 13:43:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12194217 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DACCCC43460 for ; Fri, 9 Apr 2021 13:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B6FCE610D1 for ; Fri, 9 Apr 2021 13:43:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233802AbhDINnn (ORCPT ); Fri, 9 Apr 2021 09:43:43 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46703 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233784AbhDINnl (ORCPT ); Fri, 9 Apr 2021 09:43:41 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 221045C00B5; Fri, 9 Apr 2021 09:43:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 09 Apr 2021 09:43:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=HuQXxss9Mwae18r/WxIrG9zOroT 5E4HVShjgnBrcC5s=; b=U/haWJJzfZHZwznt6+eyapNKSLR1/UIp0MBCCXYjC7+ VV62+A0h1vvE9FugIx/wqJGHwKGaK3eVWlURSeREBh/ucMbAd1OLYOlTzXf2Xa3W qu7QiQ84Xkv1STZ3jCAflOrZG1smYsuWOK4HlljgfuFEOinkUmp62GKpjGrMRjoO hbpGqza6CCvseb4lONjw3CWULnr8csOM6e6ZYRvWqxE9d1OXRB/ZdZ/JErdZ5BH2 yQdQL9xLpG/b1ga8y0mZdgXtaGhEcvMpX55eQxlC30luD+USPSf62PVzzi2urip3 YzJ8QVYcBiDjWJwxvV+zQVCAMqdeSF/c3gK/z1ZmOmQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=HuQXxs s9Mwae18r/WxIrG9zOroT5E4HVShjgnBrcC5s=; b=rLU4cu4/Fq8qdRM0q4fe7d qKhut/pq1a3FB2A2wTC5RryuzgRVP+XYV1GJ9q0ogCQDuWOGBUDVQdfDQTIFR/uF tI7TRWDKIYpvC1OECBuvdksZE8l/NzF90/UatKTS7N0ud126BWHlIGkitQ51fjhI xdFDW8ai6tCFqA3Q8GJO6RsGdv3J/yJPCOtuNCrIPeEU/lJWKd3dW0EY368lsSsW goYcCGoRfUE33zqnRerDV6nun3h7vvyDdY+fYdOGecT4fhwoaTDvjaq0OOuV9UlZ 7ArVTk4SWtL9JOzxB3ohLOM2BN8bWnyj/gPegleFYJbPwrzEUYLz6eNLgFul09xQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrdduledurdekrdduieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x4dbf08a9.dyn.telefonica.de [77.191.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 5EA22240067; Fri, 9 Apr 2021 09:43:27 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id e88e3d29 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Apr 2021 13:43:27 +0000 (UTC) Date: Fri, 9 Apr 2021 15:43:25 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?iso-8859-1?q?=C6var_Arnfj=F6r=F0?= Bjarmason , Eric Sunshine Subject: [PATCH v2 2/3] config: unify code paths to get global config paths Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's two callsites which assemble global config paths, once in the config loading code and once in the git-config(1) builtin. We're about to implement a way to override global config paths via an environment variable which would require us to adjust both sites. Unify both code paths into a single `git_global_config()` function which returns both paths for `~/.gitconfig` and the XDG config file. This will make the subsequent patch which introduces the new envvar easier to implement. No functional changes are expected from this patch. Signed-off-by: Patrick Steinhardt --- builtin/config.c | 6 ++---- config.c | 20 ++++++++++++++++---- config.h | 1 + 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 02ed0b3fe7..604a0973a5 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -671,9 +671,9 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (use_global_config) { - char *user_config = expand_user_path("~/.gitconfig", 0); - char *xdg_config = xdg_config_home("config"); + const char *user_config, *xdg_config; + git_global_config(&user_config, &xdg_config); if (!user_config) /* * It is unknown if HOME/.gitconfig exists, so @@ -688,10 +688,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) if (access_or_warn(user_config, R_OK, 0) && xdg_config && !access_or_warn(xdg_config, R_OK, 0)) { given_config_source.file = xdg_config; - free(user_config); } else { given_config_source.file = user_config; - free(xdg_config); } } else if (use_system_config) { diff --git a/config.c b/config.c index c552ab4ad9..6af0244085 100644 --- a/config.c +++ b/config.c @@ -1852,6 +1852,19 @@ const char *git_system_config(void) return system_wide; } +void git_global_config(const char **user, const char **xdg) +{ + static const char *user_config, *xdg_config; + + if (!user_config) { + user_config = expand_user_path("~/.gitconfig", 0); + xdg_config = xdg_config_home("config"); + } + + *user = user_config; + *xdg = xdg_config; +} + /* * Parse environment variable 'k' as a boolean (in various * possible spellings); if missing, use the default value 'def'. @@ -1883,9 +1896,8 @@ static int do_git_config_sequence(const struct config_options *opts, config_fn_t fn, void *data) { int ret = 0; - char *xdg_config = xdg_config_home("config"); - char *user_config = expand_user_path("~/.gitconfig", 0); char *repo_config; + const char *user_config, *xdg_config; enum config_scope prev_parsing_scope = current_parsing_scope; if (opts->commondir) @@ -1903,6 +1915,8 @@ static int do_git_config_sequence(const struct config_options *opts, data); current_parsing_scope = CONFIG_SCOPE_GLOBAL; + git_global_config(&user_config, &xdg_config); + if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) ret += git_config_from_file(fn, xdg_config, data); @@ -1927,8 +1941,6 @@ static int do_git_config_sequence(const struct config_options *opts, die(_("unable to parse command-line config")); current_parsing_scope = prev_parsing_scope; - free(xdg_config); - free(user_config); free(repo_config); return ret; } diff --git a/config.h b/config.h index 8e8376ae19..53a782e0f5 100644 --- a/config.h +++ b/config.h @@ -327,6 +327,7 @@ int config_error_nonbool(const char *); #endif const char *git_system_config(void); +void git_global_config(const char **user, const char **xdg); int git_config_parse_parameter(const char *, config_fn_t fn, void *data); From patchwork Fri Apr 9 13:43:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12194219 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E49DC433B4 for ; Fri, 9 Apr 2021 13:43:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F1ACA6113A for ; Fri, 9 Apr 2021 13:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233729AbhDINnr (ORCPT ); Fri, 9 Apr 2021 09:43:47 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58941 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233619AbhDINnq (ORCPT ); Fri, 9 Apr 2021 09:43:46 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 898785C00C1; Fri, 9 Apr 2021 09:43:33 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 09 Apr 2021 09:43:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=U4716Iwoh4d6ho57TmV/bQPCxrw UYaW9Tymr2kwNFUY=; b=qUBQgFd/XUb/nS20ddBoNEox5T1dUqvSPCGc5zXMpiK VuuIQCY8/D0BKGDAws5itmFQiItJ8n7pyh5aY3FBbyU0te3XSvsKsxtOX5dVAcBV BJAEnszZGCUjqw3XUiGBeXOIfc4YWF2yn+pXFV2YZVaWJgulWlhwc3UJ95NYXd1g l5aUq/QuNifLd0AXBn+4WmcnrzIVaL1JgQdER4G1/XjoAQq6RlU17oEyIwCoSoNL twAfTu1FnURGuqEdUUOnbafQF80SMgWRVZcEI2nUFN0bhDUcZ89N1ZZC0P2tFu5c kQtl0f2l5AFj+MJx8iKvdcRMaZGI7hH99AEFMwCV3fQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=U4716I woh4d6ho57TmV/bQPCxrwUYaW9Tymr2kwNFUY=; b=HSc+dtpKYqklkMBr2XsHuI KYRdMhpBtWqzDrocD5Z+eiU5AnNXIbkp9F2NtOA7BEjAPD2sR2CVTmi7zRlsDrRQ +FKagasJgTXzxeYHEkTcraiUviFUbOtXpyvigGM9vrgpnraLQgVN7XunehtM50FX 1UyBWYqC+2Ovb0mkGZJt6sHbkpQF557NKrs9U1GY3EW4GPbNKa2WjJO1mCoQNYtv mVcTLpzfXM42Ik2svykyS6y/z9Il4k1jL6ELklZ6+p/i0bP1xWt6b3BK5AszHtA2 IeR0l8dR+84Za941S1KnhrfR3A2p16JvWhUyokJk99AQ27g7of+VJA3mjpK22XJw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekuddgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeejrdduledurdekrdduieelnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail.pks.im (x4dbf08a9.dyn.telefonica.de [77.191.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id 4EDF3240054; Fri, 9 Apr 2021 09:43:32 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 60857d5e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 9 Apr 2021 13:43:31 +0000 (UTC) Date: Fri, 9 Apr 2021 15:43:30 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?iso-8859-1?q?=C6var_Arnfj=F6r=F0?= Bjarmason , Eric Sunshine Subject: [PATCH v2 3/3] config: allow overriding of global and system configuration Message-ID: <272a3b31aa73da8d65b04e647b1b9ca860f4e783.1617975637.git.ps@pks.im> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In order to have git run in a fully controlled environment without any misconfiguration, it may be desirable for users or scripts to override global- and system-level configuration files. We already have a way of doing this, which is to unset both HOME and XDG_CONFIG_HOME environment variables and to set `GIT_CONFIG_NOGLOBAL=true`. This is quite kludgy, and unsetting the first two variables likely has an impact on other executables spawned by such a script. The obvious way to fix this would be to introduce `GIT_CONFIG_NOSYSTEM` as an equivalent to `GIT_CONFIG_NOGLOBAL`. But in the past, it has turned out that this design is inflexible: we cannot test system-level parsing of the git configuration in our test harness because there is no way to change its location, so all tests run with `GIT_CONFIG_NOSYSTEM` set. Instead of doing the same mistake with `GIT_CONFIG_NOGLOBAL`, introduce two new variables `GIT_CONFIG_GLOBAL` and `GIT_CONFIG_SYSTEM`: - If unset, git continues to use the usual locations. - If set to a specific path, we skip reading the normal configuration files and instead take the path. This path must exist and be readable to ensure that the user didn't typo. - If set to `/dev/null`, we do not load either global- or system-level configuration at all. This implements the usecase where we want to execute code in a sanitized environment without any potential misconfigurations via `/dev/null`, but is more flexible and allows for more usecases than simply adding `GIT_CONFIG_NOGLOBAL`. Signed-off-by: Patrick Steinhardt --- Documentation/git-config.txt | 5 +++ Documentation/git.txt | 10 +++++ config.c | 34 ++++++++++++++-- t/t1300-config.sh | 75 ++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 4 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 4b4cc5c5e8..5cddadafd2 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -340,6 +340,11 @@ GIT_CONFIG:: Using the "--global" option forces this to ~/.gitconfig. Using the "--system" option forces this to $(prefix)/etc/gitconfig. +GIT_CONFIG_GLOBAL:: +GIT_CONFIG_SYSTEM:: + Take the configuration from the given files instead from global or + system-level configuration. See linkgit:git[1] for details. + GIT_CONFIG_NOSYSTEM:: Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details. diff --git a/Documentation/git.txt b/Documentation/git.txt index 3a9c44987f..2129629296 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -670,6 +670,16 @@ for further details. If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication). +`GIT_CONFIG_GLOBAL`:: +`GIT_CONFIG_SYSTEM`:: + Take the configuration from the given files instead from global or + system-level configuration files. The files must exist and be readable + by the current user. If `GIT_CONFIG_SYSTEM` is set, `/etc/gitconfig` + will not be read. Likewise, if `GIT_CONFIG_GLOBAL` is set, neither + `$HOME/.gitconfig` nor `$XDG_CONFIG_HOME/git/config` will be read. Can + be set to `/dev/null` to skip reading configuration files of the + respective level. + `GIT_CONFIG_NOSYSTEM`:: Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file. This environment variable can diff --git a/config.c b/config.c index 6af0244085..9dfc4a79f7 100644 --- a/config.c +++ b/config.c @@ -1847,8 +1847,22 @@ static int git_config_from_blob_ref(config_fn_t fn, const char *git_system_config(void) { static const char *system_wide; - if (!system_wide) - system_wide = system_path(ETC_GITCONFIG); + + if (!system_wide) { + system_wide = xstrdup_or_null(getenv("GIT_CONFIG_SYSTEM")); + if (system_wide) { + /* + * If GIT_CONFIG_SYSTEM is set, it overrides the + * /etc/gitconfig. Furthermore, the file must exist in + * order to prevent any typos by the user. + */ + if (access(system_wide, R_OK)) + die(_("cannot access '%s'"), system_wide); + } else { + system_wide = system_path(ETC_GITCONFIG); + } + } + return system_wide; } @@ -1857,8 +1871,20 @@ void git_global_config(const char **user, const char **xdg) static const char *user_config, *xdg_config; if (!user_config) { - user_config = expand_user_path("~/.gitconfig", 0); - xdg_config = xdg_config_home("config"); + user_config = xstrdup_or_null(getenv("GIT_CONFIG_GLOBAL")); + if (user_config) { + /* + * If GIT_CONFIG_GLOBAL is set, then it overrides both + * the ~/.gitconfig and the XDG configuration file. + * Furthermore, the file must exist in order to prevent + * any typos by the user. + */ + if (access(user_config, R_OK)) + die(_("cannot access '%s'"), user_config); + } else { + user_config = expand_user_path("~/.gitconfig", 0); + xdg_config = xdg_config_home("config"); + } } *user = user_config; diff --git a/t/t1300-config.sh b/t/t1300-config.sh index e0dd5d65ce..5498ca32b0 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2059,6 +2059,81 @@ test_expect_success '--show-scope with --show-origin' ' test_cmp expect output ' +test_expect_success 'override global and system config' ' + test_when_finished rm -f "$HOME"/.config/git && + + cat >"$HOME"/.gitconfig <<-EOF && + [home] + config = true + EOF + mkdir -p "$HOME"/.config/git && + cat >"$HOME"/.config/git/config <<-EOF && + [xdg] + config = true + EOF + cat >.git/config <<-EOF && + [local] + config = true + EOF + cat >custom-global-config <<-EOF && + [global] + config = true + EOF + cat >custom-system-config <<-EOF && + [system] + config = true + EOF + + cat >expect <<-EOF && + global xdg.config=true + global home.config=true + local local.config=true + EOF + git config --show-scope --list >output && + test_cmp expect output && + + sane_unset GIT_CONFIG_NOSYSTEM && + + cat >expect <<-EOF && + system system.config=true + global global.config=true + local local.config=true + EOF + GIT_CONFIG_SYSTEM=custom-system-config GIT_CONFIG_GLOBAL=custom-global-config \ + git config --show-scope --list >output && + test_cmp expect output && + + cat >expect <<-EOF && + local local.config=true + EOF + GIT_CONFIG_SYSTEM=/dev/null GIT_CONFIG_GLOBAL=/dev/null git config --show-scope --list >output && + test_cmp expect output +' + +test_expect_success 'override global and system config with missing file' ' + sane_unset GIT_CONFIG_NOSYSTEM && + test_must_fail env GIT_CONFIG_GLOBAL=does-not-exist git version && + test_must_fail env GIT_CONFIG_SYSTEM=does-not-exist git version && + GIT_CONFIG_NOSYSTEM=true GIT_CONFIG_SYSTEM=does-not-exist git version +' + +test_expect_success 'write to overridden global and system config' ' + cat >expect <