From: Eric Sunshine <sunshine@sunshineco.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] worktree: add per-worktree config files
Date: Sun, 23 Sep 2018 16:47:44 -0400 [thread overview]
Message-ID: <CAPig+cR4d3p=PoLAC=0Pss64tBa1eVq3Zz2a70spmc6Vb=cUdw@mail.gmail.com> (raw)
In-Reply-To: <20180923170438.23610-1-pclouds@gmail.com>
On Sun, Sep 23, 2018 at 1:04 PM Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> A new repo extension is added, worktreeConfig. When it is present:
>
> - Repository config reading by default includes $GIT_DIR/config _and_
> $GIT_DIR/config.worktree. "config" file remains shared in multiple
> worktree setup.
>
> - The special treatment for core.bare and core.worktree, to stay
> effective only in main worktree, is gone. These config files are
> supposed to be in config.worktree.
"These config _settings_ are supposed to be..."
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> diff --git 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) are each
s/are/in/
> +repository is used to store the configuration for that repository, and
> `$HOME/.gitconfig` is used to store a per-user configuration as
> diff --git a/t/t2029-worktree-config.sh b/t/t2029-worktree-config.sh
> @@ -0,0 +1,82 @@
> +cmp_config() {
> + if [ "$1" = "-C" ]; then
Style:
if test "$1" = "-C"
then
...
> +}
> +
> +test_expect_success 'setup' '
> + test_commit start &&
> + git config --worktree per.worktree is-ok &&
Did you want:
cmp_config false extensions.worktreeConfig
at this point in the test or something? It's not clear what the
intention is here.
> + git worktree add wt1 &&
> + git worktree add wt2 &&
> + git config --worktree per.worktree is-ok &&
> + cmp_config true extensions.worktreeConfig
> +'
> +test_expect_success 'core.bare no longer for main only' '
> + git config core.bare true &&
> + cmp_config true core.bare &&
> + cmp_config -C wt1 true core.bare &&
> + cmp_config -C wt2 true core.bare &&
> + git config --unset core.bare
Should this be?
test_when_finished "git config --unset core.bare" &&
or perhaps test_config()?
> +'
next prev parent reply other threads:[~2018-09-23 20:47 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 [this message]
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
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='CAPig+cR4d3p=PoLAC=0Pss64tBa1eVq3Zz2a70spmc6Vb=cUdw@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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).