{"thread":{"id":"56107","subject":"Bug report: GIT_CONFIG and user.email/name","startedAt":"2021-07-14T17:10:33Z","lastAt":"2021-07-20T21:55:40Z","messageCount":16,"participants":["German Lashevich","Jeff King","Junio C Hamano","Taylor Blau","Martin Ågren"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"430079","messageId":"1C6C1E49-5EC1-420D-A72A-8C50BD1931A2@getmailspring.com","threadId":"56107","inReplyTo":null,"subject":"Bug report: GIT_CONFIG and user.email/name","fromName":"German Lashevich","fromEmail":"german.lashevich@gmail.com","sentAt":"2021-07-14T17:10:27Z","receivedAt":"2021-07-14T17:10:33Z","isPatch":false,"sender":{"key":"german.lashevich@gmail.com","avatar":null},"body":"Hello,\n\nI've faced an issue while trying to use a non-default .gitconfig file\nvia specifying\nGIT_CONFIG environment variable.\n\n\nWhat did you do before the bug happened? (Steps to reproduce your issue)\n\n```\n# use custom .gitconfig via GIT_CONFIG envvar:\nmkdir -p /tmp/git-test/repo\ncat <<EOT > /tmp/git-test/.gitconfig\n[user]\n    name = John Doe\n    email = john@doe.me\nEOT\ncd /tmp/git-test/repo\ngit init\nexport GIT_CONFIG=/tmp/git-test/.gitconfig\necho Hi > readme.txt\ngit add readme.txt\ngit commit -m 'Initial commit'\n```\n\n\nWhat did you expect to happen? (Expected behavior)\nGit creates a new commit.\n\n\nWhat happened instead? (Actual behavior)\nError occurred:\n\n```\nAuthor identity unknown\n\n*** Please tell me who you are.\n\nRun\n\n  git config --global user.email \"you@example.com\"\n  git config --global user.name \"Your Name\"\n\nto set your account's default identity.\nOmit --global to set the identity only in this repository.\n\nfatal: unable to auto-detect email address (got 'john@computer.(none)')\n```\n\n\nWhat's different between what you expected and what actually happened?\nFor some reason `git commit` doesn't use configuration options specified\nin the\ncustom `.gitconfig` file.\n\n\nAnything else you want to add:\n`git config` shows correct values:\n\n```\nsh-5.1$ pwd\n/tmp/git-test/repo\nsh-5.1$ echo $GIT_CONFIG\n/tmp/git-test/.gitconfig\nsh-5.1$ cat $GIT_CONFIG\n[user]\n    name = John Doe\n    email = john@doe.me\nsh-5.1$ git config user.name\nJohn Doe\nsh-5.1$ git config user.email\njohn@doe.me\n```\n\nThe same happens with git version 2.32.0.432.gabb21c7263\n\n\n[System Info]\ngit version:\ngit version 2.32.0\ncpu: x86_64\nno commit associated with this build\nsizeof-long: 8\nsizeof-size_t: 8\nshell-path: /bin/sh\nuname: Linux 5.12.15-arch1-1 #1 SMP PREEMPT Wed, 07 Jul 2021 23:35:29\n+0000 x86_64\ncompiler info: gnuc: 11.1\nlibc info: glibc: 2.33\n$SHELL (typically, interactive shell): /bin/zsh\n"},{"id":"430096","messageId":"YO8ordiN18sNP6tA@coredump.intra.peff.net","threadId":"56107","inReplyTo":"1C6C1E49-5EC1-420D-A72A-8C50BD1931A2@getmailspring.com","subject":"Re: Bug report: GIT_CONFIG and user.email/name","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T18:10:53Z","receivedAt":"2021-07-14T18:10:56Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 14, 2021 at 07:10:27PM +0200, German Lashevich wrote:\n\n> I've faced an issue while trying to use a non-default .gitconfig file\n> via specifying\n> GIT_CONFIG environment variable.\n> \n> What did you do before the bug happened? (Steps to reproduce your issue)\n> \n> ```\n> # use custom .gitconfig via GIT_CONFIG envvar:\n> mkdir -p /tmp/git-test/repo\n> cat <<EOT > /tmp/git-test/.gitconfig\n> [user]\n>     name = John Doe\n>     email = john@doe.me\n> EOT\n> cd /tmp/git-test/repo\n> git init\n> export GIT_CONFIG=/tmp/git-test/.gitconfig\n> echo Hi > readme.txt\n> git add readme.txt\n> git commit -m 'Initial commit'\n> ```\n\nThe GIT_CONFIG variable doesn't work that way. It is not a general\nmechanism used by all of Git, but rather a specific feature of the\ngit-config program (and even there it is a historical wart; you should\nuse \"git config --file\" instead).\n\nOne of these variables is probably more helpful:\n\n  $ man git | sed -n '/GLOBAL/,/^$/p'\n  GIT_CONFIG_GLOBAL, GIT_CONFIG_SYSTEM\n    Take the configuration from the given files instead from global or\n    system-level configuration files. If GIT_CONFIG_SYSTEM is set, the\n    system config file defined at build time (usually /etc/gitconfig)\n    will not be read. Likewise, if GIT_CONFIG_GLOBAL is set, neither\n    $HOME/.gitconfig nor $XDG_CONFIG_HOME/git/config will be read. Can\n    be set to /dev/null to skip reading configuration files of the\n    respective level.\n\nNote that they're new in v2.32.0.\n\n-Peff\n"},{"id":"430098","messageId":"9A517A17-6BC6-4239-9CD5-F80C839C24F0@getmailspring.com","threadId":"56107","inReplyTo":"YO8ordiN18sNP6tA@coredump.intra.peff.net","subject":"Re: Bug report: GIT_CONFIG and user.email/name","fromName":"German Lashevich","fromEmail":"german.lashevich@gmail.com","sentAt":"2021-07-14T18:26:57Z","receivedAt":"2021-07-14T18:27:01Z","isPatch":false,"sender":{"key":"german.lashevich@gmail.com","avatar":null},"body":"GIT_CONFIG is confusing, GIT_CONFIG_GLOBAL is what I need.\n\nThanks a lot! \n\nOn Jul 14 2021, at 8:10 pm, Jeff King <peff@peff.net> wrote:\n\n> On Wed, Jul 14, 2021 at 07:10:27PM +0200, German Lashevich wrote:\n> \n>> I've faced an issue while trying to use a non-default .gitconfig file\n>> via specifying\n>> GIT_CONFIG environment variable.\n>> \n>> What did you do before the bug happened? (Steps to reproduce your issue)\n>> \n>> ```\n>> # use custom .gitconfig via GIT_CONFIG envvar:\n>> mkdir -p /tmp/git-test/repo\n>> cat <<EOT > /tmp/git-test/.gitconfig\n>> [user]\n>>     name = John Doe\n>>     email = john@doe.me\n>> EOT\n>> cd /tmp/git-test/repo\n>> git init\n>> export GIT_CONFIG=/tmp/git-test/.gitconfig\n>> echo Hi > readme.txt\n>> git add readme.txt\n>> git commit -m 'Initial commit'\n>> ```\n> \n> The GIT_CONFIG variable doesn't work that way. It is not a general\n> mechanism used by all of Git, but rather a specific feature of the\n> git-config program (and even there it is a historical wart; you should\n> use \"git config --file\" instead).\n> \n> One of these variables is probably more helpful:\n> \n>  $ man git | sed -n '/GLOBAL/,/^$/p'\n>  GIT_CONFIG_GLOBAL, GIT_CONFIG_SYSTEM\n>    Take the configuration from the given files instead from global or\n>    system-level configuration files. If GIT_CONFIG_SYSTEM is set, the\n>    system config file defined at build time (usually /etc/gitconfig)\n>    will not be read. Likewise, if GIT_CONFIG_GLOBAL is set, neither\n>    $HOME/.gitconfig nor $XDG_CONFIG_HOME/git/config will be read. Can\n>    be set to /dev/null to skip reading configuration files of the\n>    respective level.\n> \n> Note that they're new in v2.32.0.\n> \n> -Peff\n> \n"},{"id":"430127","messageId":"xmqqeec0vczo.fsf@gitster.g","threadId":"56107","inReplyTo":"YO8ordiN18sNP6tA@coredump.intra.peff.net","subject":"Re: Bug report: GIT_CONFIG and user.email/name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-07-14T20:47:55Z","receivedAt":"2021-07-14T20:47:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> The GIT_CONFIG variable doesn't work that way. It is not a general\n> mechanism used by all of Git, but rather a specific feature of the\n> git-config program (and even there it is a historical wart; you should\n> use \"git config --file\" instead).\n\nWe both have known that, but a fresh re-read of GIT_CONFIG in \"git\nhelp config\" gave me a misleading impression.\n\n    ENVIRONMENT\n    -----------\n\n    GIT_CONFIG::\n            Take the configuration from the given file instead of .git/config.\n            Using the \"--global\" option forces this to ~/.gitconfig. Using the\n            \"--system\" option forces this to $(prefix)/etc/gitconfig.\n\nis what we have above the GLOBAL and SYSTEM you quoted below.  We\nshould say GIT_CONFIG is only for \"git config\" command while the\nother two affects everybody, right?\n\nThanks.\n\n> One of these variables is probably more helpful:\n>\n>   $ man git | sed -n '/GLOBAL/,/^$/p'\n>   GIT_CONFIG_GLOBAL, GIT_CONFIG_SYSTEM\n>     Take the configuration from the given files instead from global or\n>     system-level configuration files. If GIT_CONFIG_SYSTEM is set, the\n>     system config file defined at build time (usually /etc/gitconfig)\n>     will not be read. Likewise, if GIT_CONFIG_GLOBAL is set, neither\n>     $HOME/.gitconfig nor $XDG_CONFIG_HOME/git/config will be read. Can\n>     be set to /dev/null to skip reading configuration files of the\n>     respective level.\n>\n> Note that they're new in v2.32.0.\n>\n> -Peff\n"},{"id":"430130","messageId":"YO9YyTZdU4WadYGg@coredump.intra.peff.net","threadId":"56107","inReplyTo":"xmqqeec0vczo.fsf@gitster.g","subject":"Re: Bug report: GIT_CONFIG and user.email/name","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T21:36:09Z","receivedAt":"2021-07-14T21:36:11Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 14, 2021 at 01:47:55PM -0700, Junio C Hamano wrote:\n\n> Jeff King <peff@peff.net> writes:\n> \n> > The GIT_CONFIG variable doesn't work that way. It is not a general\n> > mechanism used by all of Git, but rather a specific feature of the\n> > git-config program (and even there it is a historical wart; you should\n> > use \"git config --file\" instead).\n> \n> We both have known that, but a fresh re-read of GIT_CONFIG in \"git\n> help config\" gave me a misleading impression.\n> \n>     ENVIRONMENT\n>     -----------\n> \n>     GIT_CONFIG::\n>             Take the configuration from the given file instead of .git/config.\n>             Using the \"--global\" option forces this to ~/.gitconfig. Using the\n>             \"--system\" option forces this to $(prefix)/etc/gitconfig.\n> \n> is what we have above the GLOBAL and SYSTEM you quoted below.  We\n> should say GIT_CONFIG is only for \"git config\" command while the\n> other two affects everybody, right?\n\nYes, it looks like that description is from 2007 (when GIT_CONFIG really\ndid impact other commands). And adding GIT_CONFIG_GLOBAL and SYSTEM\nnearby certainly didn't help (before then, I might have argued that\nsince GIT_CONFIG is only in git-config(1), it is more clear that it only\napplies there).\n\nHere's a short series to improve things.\n\n  [1/3]: doc/git-config: explain --file instead of referring to GIT_CONFIG\n  [2/3]: doc/git-config: clarify GIT_CONFIG environment variable\n  [3/3]: doc/git-config: simplify \"override\" advice for FILES section\n\n Documentation/git-config.txt | 28 +++++++++++++++++-----------\n 1 file changed, 17 insertions(+), 11 deletions(-)\n\n-Peff\n"},{"id":"430131","messageId":"YO9ZGTX9f1fOpTkh@coredump.intra.peff.net","threadId":"56107","inReplyTo":"YO9YyTZdU4WadYGg@coredump.intra.peff.net","subject":"[PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T21:37:29Z","receivedAt":"2021-07-14T21:37:31Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"The explanation for the --file option only refers to GIT_CONFIG. This\nredirection to an environment variable is confusing, but doubly so\nbecause the description of GIT_CONFIG is out of date.\n\nLet's describe --file from scratch, detailing both the reading and\nwriting behavior as we do for other similar options like --system, etc.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\nThe formatting is a bit clunky to read in the source, but I think it\nlooks OK in the rendered version. At any rate, it's all taken from the\nother options, so if we want to improve it, it would make sense to do so\nseparately on top.\n\n Documentation/git-config.txt | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 5cddadafd2..193fef2867 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -143,7 +143,13 @@ See also <<FILES>>.\n \n -f config-file::\n --file config-file::\n-\tUse the given config file instead of the one specified by GIT_CONFIG.\n+\tFor writing options: write to the specified file rather than the\n+\trepository `.git/config`.\n++\n+For reading options: read only from the specified file rather than from all\n+avialable files.\n++\n+See also <<FILES>>.\n \n --blob blob::\n \tSimilar to `--file` but use the given blob instead of a file. E.g.\n-- \n2.32.0.689.gbb74d99cdd\n\n"},{"id":"430132","messageId":"YO9ZSBVHRweQNHIf@coredump.intra.peff.net","threadId":"56107","inReplyTo":"YO9YyTZdU4WadYGg@coredump.intra.peff.net","subject":"[PATCH 2/3] doc/git-config: clarify GIT_CONFIG environment variable","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T21:38:16Z","receivedAt":"2021-07-14T21:38:18Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"The scope and utility of the GIT_CONFIG variable was drastically reduced\nby dc87183189 (Only use GIT_CONFIG in \"git config\", not other programs,\n2008-06-30). But the documentation in git-config(1) predates that, which\nmakes it rather misleading.\n\nThese days it is really just another way to say \"--file\". So let's say\nthat, and explicitly make it clear that it does not impact other Git\ncommands (like GIT_CONFIG_SYSTEM, etc, would).\n\nI also bumped it to the bottom of the list of variables, and warned\npeople off of using it. We don't have any plans for deprecation at this\npoint, but there's little point in encouraging people to use it by\nputting it at the top of the list.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\nI'm taking a more opinionated stance on \"nobody should actually use this\nthing\", but I think it's merited. It really is useless, and if not for\nthe history, I'd argue against somebody trying to introduce such a thing\nnow. :)\n\n Documentation/git-config.txt | 11 ++++++-----\n 1 file changed, 6 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 193fef2867..30186812a8 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -341,11 +341,6 @@ can specify any filename you want.\n ENVIRONMENT\n -----------\n \n-GIT_CONFIG::\n-\tTake the configuration from the given file instead of .git/config.\n-\tUsing the \"--global\" option forces this to ~/.gitconfig. Using the\n-\t\"--system\" option forces this to $(prefix)/etc/gitconfig.\n-\n GIT_CONFIG_GLOBAL::\n GIT_CONFIG_SYSTEM::\n \tTake the configuration from the given files instead from global or\n@@ -373,6 +368,12 @@ This is useful for cases where you want to spawn multiple git commands\n with a common configuration but cannot depend on a configuration file,\n for example when writing scripts.\n \n+GIT_CONFIG::\n+\tIf no `--file` option is provided to `git config`, use the file\n+\tgiven by `GIT_CONFIG` as if it were provided via `--file`. This\n+\tvariable has no effect on other Git commands, and is mostly for\n+\thistorical compatibility; there is generally no reason to use it\n+\tinstead of the `--file` option.\n \n [[EXAMPLES]]\n EXAMPLES\n-- \n2.32.0.689.gbb74d99cdd\n\n"},{"id":"430133","messageId":"YO9ZU4nO7YOASAHn@coredump.intra.peff.net","threadId":"56107","inReplyTo":"YO9YyTZdU4WadYGg@coredump.intra.peff.net","subject":"[PATCH 3/3] doc/git-config: simplify \"override\" advice for FILES section","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T21:38:27Z","receivedAt":"2021-07-14T21:38:29Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"At the end of the FILES section, we indicate that you can override the\nregular lookup rules with --global, etc. But:\n\n  - we're missing the --local option\n\n  - we point to GIT_CONFIG instead of --file, but the latter has much\n    better documentation\n\n  - we're vague about how the overrides work; the actual option\n    descriptions are much better here\n\nSo let's just mention the names and point people back to the OPTIONS\nsection. We could perhaps even delete this paragraph entirely, but the\npresence of the names may give people reading FILES a clue about where\nto look for more information.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\n Documentation/git-config.txt | 9 ++++-----\n 1 file changed, 4 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 30186812a8..e30edf99c6 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -71,6 +71,7 @@ codes are:\n \n On success, the command returns the exit code 0.\n \n+[[OPTIONS]]\n OPTIONS\n -------\n \n@@ -331,11 +332,9 @@ All writing options will per default write to the repository specific\n configuration file. Note that this also affects options like `--replace-all`\n and `--unset`. *'git config' will only ever change one file at a time*.\n \n-You can override these rules either by command-line options or by environment\n-variables. The `--global`, `--system` and `--worktree` options will limit\n-the file used to the global, system-wide or per-worktree file respectively.\n-The `GIT_CONFIG` environment variable has a similar effect, but you\n-can specify any filename you want.\n+You can override these rules using the `--global`, `--system`,\n+`--local`, `--worktree`, and `--file` command-line options; see\n+<<OPTIONS>> above.\n \n \n ENVIRONMENT\n-- \n2.32.0.689.gbb74d99cdd\n"},{"id":"430141","messageId":"YO9jLvGlIVj3aI/m@nand.local","threadId":"56107","inReplyTo":"YO9ZGTX9f1fOpTkh@coredump.intra.peff.net","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2021-07-14T22:20:30Z","receivedAt":"2021-07-14T22:20:33Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Wed, Jul 14, 2021 at 05:37:29PM -0400, Jeff King wrote:\n>  -f config-file::\n>  --file config-file::\n> -\tUse the given config file instead of the one specified by GIT_CONFIG.\n> +\tFor writing options: write to the specified file rather than the\n> +\trepository `.git/config`.\n\nI wonder whether or not we should write \"rather than the repository\n`$GIT_DIR/config`\" instead of `.git/config`. The former is true for bare\nrepositories, too, but may in fact be more confusing than what you have\nwriten so clearly.\n\nPerhaps `.git/config` is clear enough; I definitely don't feel strongly\nabout it.\n\nThanks,\nTaylor\n"},{"id":"430143","messageId":"YO9jmdW9oz+beUKg@nand.local","threadId":"56107","inReplyTo":"YO9YyTZdU4WadYGg@coredump.intra.peff.net","subject":"Re: Bug report: GIT_CONFIG and user.email/name","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2021-07-14T22:22:17Z","receivedAt":"2021-07-14T22:22:20Z","isPatch":false,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Wed, Jul 14, 2021 at 05:36:09PM -0400, Jeff King wrote:\n> Here's a short series to improve things.\n>\n>   [1/3]: doc/git-config: explain --file instead of referring to GIT_CONFIG\n>   [2/3]: doc/git-config: clarify GIT_CONFIG environment variable\n>   [3/3]: doc/git-config: simplify \"override\" advice for FILES section\n>\n>  Documentation/git-config.txt | 28 +++++++++++++++++-----------\n>  1 file changed, 17 insertions(+), 11 deletions(-)\n\nLooks very good to me. I left a small note on the first patch, but you\nshould feel free to ignore it, since I'm not sure whether my suggestion\nis an improvement or not ;).\n\n    Reviewed-by: Taylor Blau <me@ttaylorr.com>\n\nThanks,\nTaylor\n"},{"id":"430144","messageId":"YO9j6hrJFFTSEd6j@coredump.intra.peff.net","threadId":"56107","inReplyTo":"YO9jLvGlIVj3aI/m@nand.local","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-14T22:23:38Z","receivedAt":"2021-07-14T22:23:40Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 14, 2021 at 06:20:30PM -0400, Taylor Blau wrote:\n\n> On Wed, Jul 14, 2021 at 05:37:29PM -0400, Jeff King wrote:\n> >  -f config-file::\n> >  --file config-file::\n> > -\tUse the given config file instead of the one specified by GIT_CONFIG.\n> > +\tFor writing options: write to the specified file rather than the\n> > +\trepository `.git/config`.\n> \n> I wonder whether or not we should write \"rather than the repository\n> `$GIT_DIR/config`\" instead of `.git/config`. The former is true for bare\n> repositories, too, but may in fact be more confusing than what you have\n> writen so clearly.\n> \n> Perhaps `.git/config` is clear enough; I definitely don't feel strongly\n> about it.\n\nYes, I noticed that, too. This is copied verbatim from the other\noptions, so if we were to do that, it should be done on top across the\nwhole file.\n\n-Peff\n"},{"id":"430146","messageId":"YO9kfhr3u/Xx1FQc@nand.local","threadId":"56107","inReplyTo":"YO9j6hrJFFTSEd6j@coredump.intra.peff.net","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2021-07-14T22:26:06Z","receivedAt":"2021-07-14T22:26:14Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"On Wed, Jul 14, 2021 at 06:23:38PM -0400, Jeff King wrote:\n> On Wed, Jul 14, 2021 at 06:20:30PM -0400, Taylor Blau wrote:\n> > Perhaps `.git/config` is clear enough; I definitely don't feel strongly\n> > about it.\n>\n> Yes, I noticed that, too. This is copied verbatim from the other\n> options, so if we were to do that, it should be done on top across the\n> whole file.\n\nI'm dubious that s,.git/config,$GIT_DIR/config,g would be an improvement\nin clarity if done across the whole file, and I'd rather be consistent\nthan not. So I think that it's fine as is.\n\nThanks,\nTaylor\n"},{"id":"430679","messageId":"CAN0heSoz8KmmtX8LVcY2wBM6Fm4TAYwDmQGPE8wpdZTmWRVzWA@mail.gmail.com","threadId":"56107","inReplyTo":"YO9ZGTX9f1fOpTkh@coredump.intra.peff.net","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2021-07-20T19:34:43Z","receivedAt":"2021-07-20T19:35:34Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"On Thu, 15 Jul 2021 at 00:25, Jeff King <peff@peff.net> wrote:\n> -       Use the given config file instead of the one specified by GIT_CONFIG.\n> +       For writing options: write to the specified file rather than the\n> +       repository `.git/config`.\n> ++\n> +For reading options: read only from the specified file rather than from all\n> +avialable files.\n\ns/avialable/available/\n\nMartin\n"},{"id":"430681","messageId":"YPcrslQNmqvlBYpX@coredump.intra.peff.net","threadId":"56107","inReplyTo":"CAN0heSoz8KmmtX8LVcY2wBM6Fm4TAYwDmQGPE8wpdZTmWRVzWA@mail.gmail.com","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-20T20:01:54Z","receivedAt":"2021-07-20T20:03:38Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jul 20, 2021 at 09:34:43PM +0200, Martin Ågren wrote:\n\n> On Thu, 15 Jul 2021 at 00:25, Jeff King <peff@peff.net> wrote:\n> > -       Use the given config file instead of the one specified by GIT_CONFIG.\n> > +       For writing options: write to the specified file rather than the\n> > +       repository `.git/config`.\n> > ++\n> > +For reading options: read only from the specified file rather than from all\n> > +avialable files.\n> \n> s/avialable/available/\n\nThanks. You'd think that I would have gotten the part cut-and-paste from\nearlier right. :)\n\nI double-checked the rest of the series for other spelling errors but\ndidn't see any. This is marked for merging to next, but hasn't made it\nyet. So if you get this in time, Junio, can you please squash this into\nthe first patch?\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 193fef2867..6c78ad1c13 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -147,7 +147,7 @@ See also <<FILES>>.\n \trepository `.git/config`.\n +\n For reading options: read only from the specified file rather than from all\n-avialable files.\n+available files.\n +\n See also <<FILES>>.\n \n\n-Peff\n"},{"id":"430682","messageId":"YPcsHdTY0tIa4+xo@coredump.intra.peff.net","threadId":"56107","inReplyTo":"YPcrslQNmqvlBYpX@coredump.intra.peff.net","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2021-07-20T20:03:41Z","receivedAt":"2021-07-20T20:04:04Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Jul 20, 2021 at 04:01:55PM -0400, Jeff King wrote:\n\n> I double-checked the rest of the series for other spelling errors but\n> didn't see any. This is marked for merging to next, but hasn't made it\n> yet. So if you get this in time, Junio, can you please squash this into\n> the first patch?\n\nI should say: the first patch of jk/config-env-doc to hopefully make it\neasier. :)\n\n-Peff\n"},{"id":"430709","messageId":"xmqqfsw8hcqf.fsf@gitster.g","threadId":"56107","inReplyTo":"YPcrslQNmqvlBYpX@coredump.intra.peff.net","subject":"Re: [PATCH 1/3] doc/git-config: explain --file instead of referring to GIT_CONFIG","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-07-20T21:55:20Z","receivedAt":"2021-07-20T21:55:40Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> I double-checked the rest of the series for other spelling errors but\n> didn't see any. This is marked for merging to next, but hasn't made it\n> yet. So if you get this in time, Junio, can you please squash this into\n> the first patch?\n\nThanks, will do.\n\n\n>\n> diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\n> index 193fef2867..6c78ad1c13 100644\n> --- a/Documentation/git-config.txt\n> +++ b/Documentation/git-config.txt\n> @@ -147,7 +147,7 @@ See also <<FILES>>.\n>  \trepository `.git/config`.\n>  +\n>  For reading options: read only from the specified file rather than from all\n> -avialable files.\n> +available files.\n>  +\n>  See also <<FILES>>.\n>  \n>\n> -Peff\n"}]}