From: Junio C Hamano <gitster@pobox.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: GitList <git@vger.kernel.org>, "SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v2] t/README: the test repo does not have global or system configs
Date: Mon, 21 Oct 2019 12:55:21 +0900 [thread overview]
Message-ID: <xmqqpniqlpli.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191018140049.2183-1-philipoakley@iee.email> (Philip Oakley's message of "Fri, 18 Oct 2019 15:00:49 +0100")
Philip Oakley <philipoakley@iee.email> writes:
> diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
> index 899e92a1c9..d4c792076d 100644
> --- a/Documentation/git-config.txt
> +++ b/Documentation/git-config.txt
> @@ -107,7 +107,7 @@ OPTIONS
> For writing options: write to global `~/.gitconfig` file
> rather than the repository `.git/config`, write to
> `$XDG_CONFIG_HOME/git/config` file if this file exists and the
> - `~/.gitconfig` file doesn't.
> + `~/.gitconfig` file if it doesn't.
The original is not easy to read, but this is not that much of an
improvement. I think what the original wants to say is
- write to global `~/.gitconfig`
- but write to the XDG place instead, if XDG one exists and
~/.gitconfig does not exist
How about touching a bit more, e.g.
For writing, rather than writing the per-repository config
file .git/config, write to the global config file, which is
$XDG_CONFIG_HOME/git/config (if it exists), or
$HOME/.gitconfig (otherwise).
to streamline the description?
> diff --git a/t/README b/t/README
> index 60d5b77bcc..71946902d7 100644
> --- a/t/README
> +++ b/t/README
> @@ -485,6 +485,13 @@ This test harness library does the following things:
> the --root option documented above, and a '.stress-<N>' suffix
> appended by the --stress option.
>
> + - The test framework sets GIT_CONFIG_NOSYSTEM=1, thus ignoring any
> + --system config files. The --global config is redirected through
> + the environment variables. It unsets the $XDG_CONFIG_HOME variable
> + and sets HOME="$TRASH_DIRECTORY" for the tests.
> + A basic --local config is created in the test repository.
> + See linkgit:git-config[1].
Correct, even though I would say s/thus ignoring/in order to ignore/
instead ;-)
Thanks.
prev parent reply other threads:[~2019-10-21 3:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 12:45 [RFC PATCH v1] t/README: the test repo does not have global or system configs Philip Oakley
2019-10-16 16:47 ` SZEDER Gábor
2019-10-16 19:08 ` Philip Oakley
2019-10-18 14:00 ` [PATCH v2] " Philip Oakley
2019-10-21 3:55 ` Junio C Hamano [this message]
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=xmqqpniqlpli.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.email \
--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).