Re: [PATCH v4 2/2] worktree: add per-worktree config files
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 22, 2018, 04:54 UTC
- Message-ID
- <xmqqefciwphv.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20181021140228.24941-3-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
Show 27 quoted lines
> diff --git a/Documentation/config.txt b/Documentation/config.txt > index 552827935a..244560a35e 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -2,8 +2,9 @@ CONFIGURATION FILE > ------------------ > > The Git configuration file contains a number of variables that affect > -the Git commands' behavior. The `.git/config` file in each repository > -is used to store the configuration for that repository, and > +the Git commands' behavior. The files `.git/config` and optionally > +`config.worktree` (see `extensions.worktreeConfig` below) in each > +repository are used to store the configuration for that repository, and > `$HOME/.gitconfig` is used to store a per-user configuration as > fallback values for the `.git/config` file. The file `/etc/gitconfig` > can be used to store a system-wide default configuration. > @@ -371,6 +372,13 @@ advice.*:: > editor input from the user. > -- > > +extensions.worktreeConfig:: > + If set, by default "git config" reads from both "config" and > + "config.worktree" file from GIT_DIR in that order. In > + multiple working directory mode, "config" file is shared while > + "config.worktree" is per-working directory (i.e., it's in > + GIT_COMMON_DIR/worktrees/<id>/config.worktree) > +
This obviously conflicts with your 59-patch series, but more importantly
- I notice that this is the only description of extensions.* key in the configuration files. Don't we have any other extension defined, and if so shouldn't we be describing them already (not as a part of this series, obviously)?
- If we are going to describe other extensions.* keys, do we want extensions-config.txt file to split this (and others) out and later rename it to config/extensions.txt? Or do we want to collect related things together by logically not by name and have this extension described in config/worktree.txt instead, perhaps separate from other extensions.* keys?