From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: David Tran <unsignedzero@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH 04/12] t: stop using GIT_CONFIG to cross repo boundaries
Date: Fri, 21 Mar 2014 14:26:02 -0700 [thread overview]
Message-ID: <xmqqtxars0ph.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140320231524.GD8479@sigill.intra.peff.net> (Jeff King's message of "Thu, 20 Mar 2014 19:15:24 -0400")
Jeff King <peff@peff•net> writes:
> Some tests want to check or set config in another
> repository. E.g., t1000 creates repositories and makes sure
> that their core.bare and core.worktree settings are what we
> expect. We can do this with:
>
> GIT_CONFIG=$repo/.git/config git config ...
>
> but it better shows the intent to just enter the repository
> and let "git config" do the normal lookups:
>
> (cd $repo && git config ...)
>
> In theory, this would cause us to use an extra subshell, but
> in all such cases, we are actually already in a subshell.
Sure; alternatively we could use "git -C $there", but this rewrite
is fine by me.
Thanks.
> Signed-off-by: Jeff King <peff@peff•net>
> ---
> t/t0001-init.sh | 4 ++--
> t/t5701-clone-local.sh | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/t/t0001-init.sh b/t/t0001-init.sh
> index ddc8160..9b05fdf 100755
> --- a/t/t0001-init.sh
> +++ b/t/t0001-init.sh
> @@ -12,8 +12,8 @@ check_config () {
> echo "expected a directory $1, a file $1/config and $1/refs"
> return 1
> fi
> - bare=$(GIT_CONFIG="$1/config" git config --bool core.bare)
> - worktree=$(GIT_CONFIG="$1/config" git config core.worktree) ||
> + bare=$(cd "$1" && git config --bool core.bare)
> + worktree=$(cd "$1" && git config core.worktree) ||
> worktree=unset
>
> test "$bare" = "$2" && test "$worktree" = "$3" || {
> diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
> index c490368..3c087e9 100755
> --- a/t/t5701-clone-local.sh
> +++ b/t/t5701-clone-local.sh
> @@ -12,8 +12,8 @@ test_expect_success 'preparing origin repository' '
> : >file && git add . && git commit -m1 &&
> git clone --bare . a.git &&
> git clone --bare . x &&
> - test "$(GIT_CONFIG=a.git/config git config --bool core.bare)" = true &&
> - test "$(GIT_CONFIG=x/config git config --bool core.bare)" = true &&
> + test "$(cd a.git && git config --bool core.bare)" = true &&
> + test "$(cd x && git config --bool core.bare)" = true &&
> git bundle create b1.bundle --all &&
> git bundle create b2.bundle master &&
> mkdir dir &&
> @@ -24,7 +24,7 @@ test_expect_success 'preparing origin repository' '
> test_expect_success 'local clone without .git suffix' '
> git clone -l -s a b &&
> (cd b &&
> - test "$(GIT_CONFIG=.git/config git config --bool core.bare)" = false &&
> + test "$(git config --bool core.bare)" = false &&
> git fetch)
> '
next prev parent reply other threads:[~2014-03-21 21:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <244284@gmane.comp.version-control.git>
2014-03-18 12:08 ` [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell David Tran
2014-03-18 20:37 ` Junio C Hamano
2014-03-18 21:45 ` Jeff King
2014-03-18 22:16 ` Junio C Hamano
2014-03-18 23:06 ` Jeff King
2014-03-19 17:28 ` Junio C Hamano
2014-03-20 23:11 ` [PATCH 0/12] GIT_CONFIG in the test suite Jeff King
2014-03-20 23:13 ` [PATCH 01/12] t/Makefile: stop setting GIT_CONFIG Jeff King
2014-03-20 23:13 ` [PATCH 02/12] t/test-lib: drop redundant unset of GIT_CONFIG Jeff King
2014-03-20 23:14 ` [PATCH 03/12] t: drop useless sane_unset GIT_* calls Jeff King
2014-03-21 21:24 ` Junio C Hamano
2014-03-24 21:56 ` Jeff King
2014-03-24 22:06 ` Junio C Hamano
2014-03-25 4:56 ` Junio C Hamano
2014-03-20 23:15 ` [PATCH 04/12] t: stop using GIT_CONFIG to cross repo boundaries Jeff King
2014-03-21 21:26 ` Junio C Hamano [this message]
2014-03-24 22:00 ` Jeff King
2014-03-20 23:15 ` [PATCH 05/12] t: prefer "git config --file" to GIT_CONFIG with test_must_fail Jeff King
2014-03-20 23:17 ` [PATCH 06/12] t: prefer "git config --file" to GIT_CONFIG Jeff King
2014-03-20 23:17 ` [PATCH 07/12] t0001: make symlink reinit test more careful Jeff King
2014-03-20 23:17 ` [PATCH 08/12] t0001: use test_path_is_* Jeff King
2014-03-20 23:18 ` [PATCH 09/12] t0001: use test_config_global Jeff King
2014-03-20 23:19 ` [PATCH 10/12] t0001: use test_must_fail Jeff King
2014-03-20 23:21 ` [PATCH 11/12] t0001: drop useless subshells Jeff King
2014-03-21 20:27 ` Eric Sunshine
2014-03-20 23:23 ` [PATCH 12/12] t0001: drop subshells just for "cd" Jeff King
2014-03-18 22:36 ` [PATCH v2] tests: set temp variables using 'env' in test function instead of subshell Eric Sunshine
2014-03-18 20:52 ` Eric Sunshine
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtxars0ph.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=unsignedzero@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox