From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>,
"Taylor Blau" <me@ttaylorr.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v4 2/2] worktree: add per-worktree config files
Date: Mon, 22 Oct 2018 16:32:37 +0200 [thread overview]
Message-ID: <CACsJy8BYJKKdnbNYBR-XNeSE9jpWqby+epMKWo9-wGRjVE8Lfg@mail.gmail.com> (raw)
In-Reply-To: <xmqqefciwphv.fsf@gitster-ct.c.googlers.com>
On Mon, Oct 22, 2018 at 6:54 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
>
> > 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)?
Right. We have two extensions already but it's described in
technical/repository-format.txt. I'll move this extension there
because it's written "This document will serve as the master list for
extensions." in that document.
> - 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?
I think we would go with config/extensions.txt because if grouping
logically, I'm not sure where extensions.preciousObjects and
extensions.partialClone would go.
--
Duy
next prev parent reply other threads:[~2018-10-22 14:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-23 17:04 [PATCH] worktree: add per-worktree config files Nguyễn Thái Ngọc Duy
2018-09-23 20:47 ` Eric Sunshine
2018-09-24 14:21 ` Taylor Blau
2018-09-25 15:57 ` Duy Nguyen
2018-09-29 13:53 ` Duy Nguyen
2018-09-25 21:26 ` Junio C Hamano
2018-09-26 15:48 ` Duy Nguyen
2018-09-26 17:40 ` Junio C Hamano
2018-09-27 15:24 ` Wherefor worktrees? Marc Branchaud
2018-09-27 16:36 ` Duy Nguyen
2018-09-26 18:25 ` [PATCH] worktree: add per-worktree config files Ævar Arnfjörð Bjarmason
2018-09-27 17:24 ` Duy Nguyen
2018-09-27 18:34 ` Ævar Arnfjörð Bjarmason
2018-09-27 18:49 ` Duy Nguyen
2018-09-29 6:36 ` Duy Nguyen
2018-09-29 15:30 ` [PATCH v2 0/2] Per-worktree " Nguyễn Thái Ngọc Duy
2018-09-29 15:30 ` [PATCH v2 1/2] t1300: extract and use test_cmp_config() Nguyễn Thái Ngọc Duy
2018-09-30 4:05 ` Eric Sunshine
2018-09-30 12:31 ` SZEDER Gábor
2018-09-29 15:30 ` [PATCH v2 2/2] worktree: add per-worktree config files Nguyễn Thái Ngọc Duy
2018-09-30 4:32 ` Eric Sunshine
2018-09-30 7:15 ` Duy Nguyen
2018-09-30 7:24 ` Eric Sunshine
2018-09-30 7:36 ` Duy Nguyen
2018-10-02 16:06 ` [PATCH v3 0/2] Per-worktree " Nguyễn Thái Ngọc Duy
2018-10-02 16:06 ` [PATCH v3 1/2] t1300: extract and use test_cmp_config() Nguyễn Thái Ngọc Duy
2018-10-03 7:46 ` Eric Sunshine
2018-10-02 16:06 ` [PATCH v3 2/2] worktree: add per-worktree config files Nguyễn Thái Ngọc Duy
2018-10-21 14:02 ` [PATCH v4 0/2] Per-worktree " Nguyễn Thái Ngọc Duy
2018-10-21 14:02 ` [PATCH v4 1/2] t1300: extract and use test_cmp_config() Nguyễn Thái Ngọc Duy
2018-10-21 14:02 ` [PATCH v4 2/2] worktree: add per-worktree config files Nguyễn Thái Ngọc Duy
2018-10-22 4:54 ` Junio C Hamano
2018-10-22 14:32 ` Duy Nguyen [this message]
2018-10-25 9:16 ` Junio C Hamano
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=CACsJy8BYJKKdnbNYBR-XNeSE9jpWqby+epMKWo9-wGRjVE8Lfg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--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).