From patchwork Mon Apr 12 14:46:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12198277 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.7 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 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 0006EC43461 for ; Mon, 12 Apr 2021 14:46:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE2E361355 for ; Mon, 12 Apr 2021 14:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242464AbhDLOrI (ORCPT ); Mon, 12 Apr 2021 10:47:08 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:42381 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242427AbhDLOrG (ORCPT ); Mon, 12 Apr 2021 10:47:06 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 0C59717AD; Mon, 12 Apr 2021 10:46:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 12 Apr 2021 10:46:48 -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=GSFjgsCC/gQ4WOMjWR2NrOtz8zR StZ+yFKURkfkfG40=; b=Lj1lM0Dk/Soy+3Kdq7SSMFB1tSfv/BKdT9QDNjivcy8 /Rs4iJ8xiiJkXHxnGXGnr0fK8LFCkvuzOEIFLu7GwE2DFNj2oeth5KTYS88PqbTC piioK+0TKVJ9iShpBC+NeZ15q1pku+yynO9Jwk9kDIB6UJfnEbbX9jHnZQQTvRbf NVSqbjrZ3IcZ2PNwZb8q0uu+5OptD5cAJEPPNdUiWBRhz17ezRRC9pqzRDMOfcw3 eNPw5XFci3CwruXcXqL95XHEftCYcKEpswNTvM5htoQNLup7awvRGywkqNgzezUy wCN77/LI9aXQS9XNbXLxyt1LtQysL+0+Cj+ehVO1S0A== 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=GSFjgs CC/gQ4WOMjWR2NrOtz8zRStZ+yFKURkfkfG40=; b=S83wadIXQMnOmWPAumPkvx ED/OYVcsFel67wXa6nJga3VUarDeGoSb5W5PtCrK6pMrwgSCq9s9dg+/Z19NC7yV FGUOB5+nD2Rx8GpWcM6OPyIm5OsRT0sexIa6uzsffGqxNDrG39ECfGPMFLDSjzPT E8UNnWbTl2evXkQiXERngUOgOOtfi/Sir7ZwzyYVie6YOfpoon/YGuljIKNh2/XW WDYrYthF1yZb/2E+fHnfwK61mjmiBdzVUt2T2wOGRA07rh0P5YhjyXkENg7Eqppu 7ubVcsN8Llhf6UIwXi2AOEKCDfWone8IEzRHmg2w08JCgK0bkHJAaT9iavj2O2yA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekjedgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehhedrfeehrdeftdenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-055-035-030.78.55.pool.telefonica.de [78.55.35.30]) by mail.messagingengine.com (Postfix) with ESMTPA id E2E89240066; Mon, 12 Apr 2021 10:46:46 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id dce45324 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 12 Apr 2021 14:46:46 +0000 (UTC) Date: Mon, 12 Apr 2021 16:46:45 +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 v3 1/3] config: rename `git_etc_config()` Message-ID: <34bdbc27d618d7467d2caf6844d8c06bdcb8545b.1618238567.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 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. While at it, the function is also refactored to pass memory ownership to the caller. This is done to better match semantics of `git_global_config()`, which is going to be introduced in the next commit. Signed-off-by: Patrick Steinhardt --- builtin/config.c | 2 +- config.c | 18 ++++++++---------- config.h | 3 ++- 3 files changed, 11 insertions(+), 12 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..8c83669cce 100644 --- a/config.c +++ b/config.c @@ -1844,12 +1844,9 @@ 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) +char *git_system_config(void) { - static const char *system_wide; - if (!system_wide) - system_wide = system_path(ETC_GITCONFIG); - return system_wide; + return system_path(ETC_GITCONFIG); } /* @@ -1883,6 +1880,7 @@ static int do_git_config_sequence(const struct config_options *opts, config_fn_t fn, void *data) { int ret = 0; + char *system_config = git_system_config(); char *xdg_config = xdg_config_home("config"); char *user_config = expand_user_path("~/.gitconfig", 0); char *repo_config; @@ -1896,11 +1894,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, - opts->system_gently ? - ACCESS_EACCES_OK : 0)) - ret += git_config_from_file(fn, git_etc_gitconfig(), - data); + if (system_config && !access_or_die(system_config, R_OK, + opts->system_gently ? + ACCESS_EACCES_OK : 0)) + ret += git_config_from_file(fn, system_config, data); current_parsing_scope = CONFIG_SCOPE_GLOBAL; if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) @@ -1927,6 +1924,7 @@ 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(system_config); free(xdg_config); free(user_config); free(repo_config); diff --git a/config.h b/config.h index 19a9adbaa9..2be8fa1880 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 +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 Mon Apr 12 14:46:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12198283 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.7 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 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 E87D2C43462 for ; Mon, 12 Apr 2021 14:46:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C012A6135A for ; Mon, 12 Apr 2021 14:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242491AbhDLOrM (ORCPT ); Mon, 12 Apr 2021 10:47:12 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:58689 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242439AbhDLOrL (ORCPT ); Mon, 12 Apr 2021 10:47:11 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 2FECB17AD; Mon, 12 Apr 2021 10:46:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Apr 2021 10:46:53 -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=esXFnW26KkdAsYxobvs3tHJkdld f+sbO6+xRblzyDZ0=; b=J6yl0WLZtZGiTefsH3mSCv3NWrFzVUGKDCY0HbF6WlV GZmDiWTAeoVaB4a77SsfRZTQFE3EtisGrPQoSgWTO4GTZhwTrNGq/kuS1xcRlB6B X8bWnThmoE9iSdOEbOGkCEAv3+Xhiz977vQH/8hEQnERxJxIZxItNKg3O1ncyXlz uSAtjsuRxK0AcBB+HGkeuGhHoVfBaWm/CBxzbXAHyaferePO+V1WY8RVTTx12mGG cA0ZQuRYKDMrNXh9EhB10aKdm+i0lMRNe2ArGfSDA4ErE4N0YWBPyfF8XfeHDwGT PRD38HEy2fh+/gqltSN9nPV0gjsmp6PYFciXns/jT/g== 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=esXFnW 26KkdAsYxobvs3tHJkdldf+sbO6+xRblzyDZ0=; b=RJAykQhI6YFAxMocEt7XpH Ij/W9y1PoYr3TkbusvOvIiBd7Le6gprZOoiOe0x1VeipXbDFhU9SdDMYpRKIvtqm wxL6PLxk/kNaFR+iMOYCVfKV+767LYPU1clsKpRGXR6gCQtjyw6ciPoKvnhbda+g auiTyJRyCmzxsEQdgoOdjL0IyqG2KebT0eGaVsPwYdHYqoJD+q1qB1u9T2InD+tG ATBYoghhF1A0bXNO9iztcxAytvRwVLrDjF38O4D3ZbW3yJM+wB5mjkFzyyuwfOwM aKkJEZOhm2S+PtG54vjAqX35nloF10U9mf5Rss9N34iIVSY7NS/INOwgsPf5lscQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekjedgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehhedrfeehrdeftdenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-055-035-030.78.55.pool.telefonica.de [78.55.35.30]) by mail.messagingengine.com (Postfix) with ESMTPA id D64C524005B; Mon, 12 Apr 2021 10:46:51 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id 0429a9c4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 12 Apr 2021 14:46:51 +0000 (UTC) Date: Mon, 12 Apr 2021 16:46:49 +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 v3 2/3] config: unify code paths to get global config paths Message-ID: <30f18679bd5b5afb581506b95f76871124be5126.1618238567.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 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 | 4 ++-- config.c | 12 ++++++++++-- config.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 02ed0b3fe7..865fddd6ce 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"); + char *user_config, *xdg_config; + git_global_config(&user_config, &xdg_config); if (!user_config) /* * It is unknown if HOME/.gitconfig exists, so diff --git a/config.c b/config.c index 8c83669cce..ebff58aa57 100644 --- a/config.c +++ b/config.c @@ -1849,6 +1849,12 @@ char *git_system_config(void) return system_path(ETC_GITCONFIG); } +void git_global_config(char **user_config, char **xdg_config) +{ + *user_config = expand_user_path("~/.gitconfig", 0); + *xdg_config = xdg_config_home("config"); +} + /* * Parse environment variable 'k' as a boolean (in various * possible spellings); if missing, use the default value 'def'. @@ -1881,8 +1887,8 @@ static int do_git_config_sequence(const struct config_options *opts, { int ret = 0; char *system_config = git_system_config(); - char *xdg_config = xdg_config_home("config"); - char *user_config = expand_user_path("~/.gitconfig", 0); + char *xdg_config = NULL; + char *user_config = NULL; char *repo_config; enum config_scope prev_parsing_scope = current_parsing_scope; @@ -1900,6 +1906,8 @@ static int do_git_config_sequence(const struct config_options *opts, ret += git_config_from_file(fn, system_config, 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); diff --git a/config.h b/config.h index 2be8fa1880..9038538ffd 100644 --- a/config.h +++ b/config.h @@ -327,6 +327,7 @@ int config_error_nonbool(const char *); #endif char *git_system_config(void); +void git_global_config(char **user, char **xdg); int git_config_parse_parameter(const char *, config_fn_t fn, void *data); From patchwork Mon Apr 12 14:46:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 12198285 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.7 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 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 20DB0C43461 for ; Mon, 12 Apr 2021 14:46:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EBFD161352 for ; Mon, 12 Apr 2021 14:46:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242503AbhDLOrQ (ORCPT ); Mon, 12 Apr 2021 10:47:16 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:54993 "EHLO wout5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242501AbhDLOrP (ORCPT ); Mon, 12 Apr 2021 10:47:15 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id DFD0517CF; Mon, 12 Apr 2021 10:46:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 12 Apr 2021 10:46:57 -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=jBHqByTMN1jwhox29GtLIjvBpzZ UFlfvg2DOM6XoS3c=; b=HLqr5teJlT8+VYRmWv5lt2pbK/CDgSJtCqkQilV9OXj /pHlz68C8+z1LMuQJKEVULt6lVLmuzqbBdcoef3/MdvKVPqpSvrBEIO16rdaLYW9 lkSL39o+tPzyKEK2YP/pn5cq8Z7xPXZgtx2zZ4JubPb5LxYukjuSR5xOhzfkZac+ CtYdUzEg2zyhAYAag3DCt3LIx6r2GnCo5CyVQfGOcuq+gN3zhSvvoXhGgpMMah+R sexLgGDOqMIbroiD7EBma/QULog0RSx72kbL+YUB6wzuF7zwq9rE+2ObJNR6y+Hc 2qb8mN4hmqX9SsWajPj/x6ZU+fdMxuYlAFOIsH8EMuw== 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=jBHqBy TMN1jwhox29GtLIjvBpzZUFlfvg2DOM6XoS3c=; b=thFX2AuaPUMshhfBnhPMsm dmtHWqEN30nmboGykAfv/jTt1QuA1BrIrCL10T2T60sQU+FBAaAwrWyIoXfBf0xa /Mza052DKT/J+yGg9DTQA0hLjJVQyDM6EkQ1nqBI6VH1ePGY8a3Ni7j3AtmUFOKq VxeC/dM8ehcWyFAuDtJn40qBdOjFHM1kti4Z9hVo95LJbHNxuJwNaSX05MC6MeR8 5LBt9psMYhczrDBL5ZZX9plG6XhvAEVfzvafQfx5mEpnmSRvO/jCJDTUcR3s8sRP 1CWGpNlDOg/+DkBDdozGkSpueM9X3m9wJ1NvjaDc1ix2ffizDEJEYquveMzWUxCg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekjedgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucggtffrrghtthgvrh hnpeehgefhtdefueffheekgfffudelffejtdfhvdejkedthfehvdelgfetgfdvtedthfen ucfkphepjeekrdehhedrfeehrdeftdenucevlhhushhtvghrufhiiigvpedvnecurfgrrh grmhepmhgrihhlfhhrohhmpehpshesphhkshdrihhm X-ME-Proxy: Received: from vm-mail.pks.im (dynamic-078-055-035-030.78.55.pool.telefonica.de [78.55.35.30]) by mail.messagingengine.com (Postfix) with ESMTPA id C5766240066; Mon, 12 Apr 2021 10:46:55 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail.pks.im (OpenSMTPD) with ESMTPSA id ed18ced2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 12 Apr 2021 14:46:55 +0000 (UTC) Date: Mon, 12 Apr 2021 16:46:54 +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 v3 3/3] config: allow overriding of global and system configuration Message-ID: 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_NOGLOBAL` as an equivalent to `GIT_CONFIG_NOSYSTEM`. 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. - 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 +++++ builtin/config.c | 6 ++- config.c | 24 ++++++++++-- t/t1300-config.sh | 71 ++++++++++++++++++++++++++++++++++++ 5 files changed, 112 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..380422a6a9 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. If `GIT_CONFIG_SYSTEM` is set, the + system config file defined at build time (usually `/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/builtin/config.c b/builtin/config.c index 865fddd6ce..9104816459 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -674,7 +674,10 @@ int cmd_config(int argc, const char **argv, const char *prefix) char *user_config, *xdg_config; git_global_config(&user_config, &xdg_config); - if (!user_config) + if (!user_config) { + if (getenv("GIT_CONFIG_GLOBAL")) + die(_("GIT_CONFIG_GLOBAL=/dev/null set")); + /* * It is unknown if HOME/.gitconfig exists, so * we do not know if we should write to XDG @@ -682,6 +685,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) * is set and points at a sane location. */ die(_("$HOME not set")); + } given_config_source.scope = CONFIG_SCOPE_GLOBAL; diff --git a/config.c b/config.c index ebff58aa57..ed46eda997 100644 --- a/config.c +++ b/config.c @@ -1846,13 +1846,31 @@ static int git_config_from_blob_ref(config_fn_t fn, char *git_system_config(void) { + char *system_config = xstrdup_or_null(getenv("GIT_CONFIG_SYSTEM")); + if (system_config) { + if (!strcmp(system_config, "/dev/null")) + FREE_AND_NULL(system_config); + return system_config; + } return system_path(ETC_GITCONFIG); } -void git_global_config(char **user_config, char **xdg_config) +void git_global_config(char **user_out, char **xdg_out) { - *user_config = expand_user_path("~/.gitconfig", 0); - *xdg_config = xdg_config_home("config"); + char *user_config = xstrdup_or_null(getenv("GIT_CONFIG_GLOBAL")); + char *xdg_config = NULL; + + if (user_config) { + if (!strcmp(user_config, "/dev/null")) + FREE_AND_NULL(user_config); + xdg_config = NULL; + } else { + user_config = expand_user_path("~/.gitconfig", 0); + xdg_config = xdg_config_home("config"); + } + + *user_out = user_config; + *xdg_out = xdg_config; } /* diff --git a/t/t1300-config.sh b/t/t1300-config.sh index e0dd5d65ce..17f1b78c01 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2059,6 +2059,77 @@ 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_CONFIG_SYSTEM=/dev/null git config --global --list >actual && + test_must_fail env GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=does-not-exist git config --system --list >actual && + GIT_CONFIG_GLOBAL=does-not-exist GIT_CONFIG_SYSTEM=does-not-exist git version +' + +test_expect_success 'write to overridden global and system config' ' + cat >expect <