From: Patrick Steinhardt <ps@pks.im>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: Re: [PATCH v4 1/3] config: rename `git_etc_config()`
Date: Mon, 19 Apr 2021 13:03:56 +0200 [thread overview]
Message-ID: <YH1jnIhuF4UjXVNW@tanuki> (raw)
In-Reply-To: <YHvGE5/LRPN9obZi@coredump.intra.peff.net>
[-- Attachment #1: Type: text/plain, Size: 2842 bytes --]
On Sun, Apr 18, 2021 at 01:39:31AM -0400, Jeff King wrote:
> On Sat, Apr 17, 2021 at 02:37:39PM -0700, Junio C Hamano wrote:
>
> > Jeff King <peff@peff.net> writes:
> >
> > > On Fri, Apr 16, 2021 at 11:14:51PM +0200, SZEDER Gábor wrote:
> > >
> > >> > @@ -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,
> > >>
> > >> Removing git_config_system() from the condition breaks
> > >> GIT_CONFIG_NOSYSTEM:
> > >
> > > Good catch. My gut feeling is that the new git_system_config() should
> > > check NOSYSTEM and return NULL if it's set, and then we can get rid of
> > > git_config_system() entirely.
> >
> > NULL -> /dev/null I guess?
>
> I was thinking NULL to catch this line from the post-image of Patrick's
> series:
>
> 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);
>
> which would see that we have no file at all. But that may be unexpected
> for other callers (right now git_etc_gitconfig() can never return NULL,
> and I'm not sure what would happen with "git config --system"; I suspect
> it would do the regular config sequence instead, which is wrong).
>
> So yeah, probably returning /dev/null is more sensible (and makes it a
> true alias for GIT_CONFIG_SYSTEM=/dev/null).
>
> -Peff
It's only by accident that I dropped the call to `git_config_system()`,
must've happened when resolving conflicts somewhere. The issue with just
returning `/dev/null` from `git_system_config()` is that git-config(1)
would be broken, as you hint at. We do not honor GIT_CONFIG_NOSYSTEM
there if the "--system" flag was given.
So yes, we could change it to return `/dev/null`, but that would change
semantics of GIT_CONFIG_NOSYSTEM. I'm not sure doing this in the same
series is a good idea. Even more so because with returning `/dev/null`,
the conversion would be silent: whereas previous versions simply wrote
to or read from the system-level config, we now pretend to have read or
written something even though we didn't.
Patrick
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-04-19 11:03 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 14:17 [PATCH] config: Introduce GIT_CONFIG_NOGLOBAL Patrick Steinhardt
2021-04-08 16:44 ` Eric Sunshine
2021-04-08 17:25 ` Junio C Hamano
2021-04-08 23:18 ` Jeff King
2021-04-08 23:43 ` Junio C Hamano
2021-04-09 0:25 ` Jeff King
2021-04-08 23:34 ` Ævar Arnfjörð Bjarmason
2021-04-08 23:39 ` Ævar Arnfjörð Bjarmason
2021-04-08 23:30 ` Ævar Arnfjörð Bjarmason
2021-04-08 23:56 ` Junio C Hamano
2021-04-09 13:43 ` [PATCH v2 0/3] config: allow overriding global/system config Patrick Steinhardt
2021-04-09 13:43 ` [PATCH v2 1/3] config: rename `git_etc_config()` Patrick Steinhardt
2021-04-09 15:13 ` Jeff King
2021-04-09 13:43 ` [PATCH v2 2/3] config: unify code paths to get global config paths Patrick Steinhardt
2021-04-09 15:21 ` Jeff King
2021-04-09 13:43 ` [PATCH v2 3/3] config: allow overriding of global and system configuration Patrick Steinhardt
2021-04-09 15:38 ` Jeff King
2021-04-12 14:04 ` Patrick Steinhardt
2021-04-09 22:18 ` Junio C Hamano
2021-04-09 15:41 ` [PATCH v2 0/3] config: allow overriding global/system config Jeff King
2021-04-12 14:46 ` [PATCH v3 " Patrick Steinhardt
2021-04-12 14:46 ` [PATCH v3 1/3] config: rename `git_etc_config()` Patrick Steinhardt
2021-04-12 14:46 ` [PATCH v3 2/3] config: unify code paths to get global config paths Patrick Steinhardt
2021-04-12 14:46 ` [PATCH v3 3/3] config: allow overriding of global and system configuration Patrick Steinhardt
2021-04-12 17:04 ` Junio C Hamano
2021-04-13 7:11 ` [PATCH v4 0/3] config: allow overriding global/system config Patrick Steinhardt
2021-04-13 7:11 ` [PATCH v4 1/3] config: rename `git_etc_config()` Patrick Steinhardt
2021-04-13 7:25 ` Jeff King
2021-04-16 21:14 ` SZEDER Gábor
2021-04-17 8:44 ` Jeff King
2021-04-17 21:37 ` Junio C Hamano
2021-04-18 5:39 ` Jeff King
2021-04-19 11:03 ` Patrick Steinhardt [this message]
2021-04-23 9:27 ` Jeff King
2021-04-13 7:11 ` [PATCH v4 2/3] config: unify code paths to get global config paths Patrick Steinhardt
2021-04-13 7:11 ` [PATCH v4 3/3] config: allow overriding of global and system configuration Patrick Steinhardt
2021-04-13 7:33 ` Jeff King
2021-04-13 7:54 ` Patrick Steinhardt
2021-04-13 7:33 ` [PATCH v4 0/3] config: allow overriding global/system config Jeff King
2021-04-13 17:49 ` Junio C Hamano
2021-04-14 5:37 ` Patrick Steinhardt
2021-04-19 12:31 ` [PATCH v5 " Patrick Steinhardt
2021-04-19 12:31 ` [PATCH v5 1/3] config: rename `git_etc_config()` Patrick Steinhardt
2021-04-19 12:31 ` [PATCH v5 2/3] config: unify code paths to get global config paths Patrick Steinhardt
2021-04-19 12:31 ` [PATCH v5 3/3] config: allow overriding of global and system configuration Patrick Steinhardt
2021-04-21 20:46 ` SZEDER Gábor
2021-04-21 21:06 ` SZEDER Gábor
2021-04-22 5:36 ` Patrick Steinhardt
2021-04-23 5:47 ` [PATCH] t1300: fix unset of GIT_CONFIG_NOSYSTEM leaking into subsequent tests Patrick Steinhardt
2021-04-19 21:55 ` [PATCH v5 0/3] config: allow overriding global/system config Junio C Hamano
2021-04-23 9:32 ` Jeff King
2021-04-12 14:46 ` [PATCH v3] config: allow overriding of global and system configuration Patrick Steinhardt
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://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YH1jnIhuF4UjXVNW@tanuki \
--to=ps@pks.im \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/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/mirrors/git.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).