From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: peff@peff.net, torvalds@linux-foundation.org
Subject: [PATCH 2/4] t13xx: do not assume system config is empty
Date: Wed, 28 Sep 2016 16:30:45 -0700 [thread overview]
Message-ID: <20160928233047.14313-3-gitster@pobox.com> (raw)
In-Reply-To: <20160928233047.14313-1-gitster@pobox.com>
Most parts of these two tests want to read from the local
configuration file they prepare and make sure expected names and
values appear with "git config --list".
Once we add custom configuration items that we want to affect the
tests with globally to t/gitconfig-for-test file, these will start
seeing the contents from there and break. Clarify with --local that
they only care about the contents from their local configuration.
The tests for show-origin codepath in "git config" however cannot be
tweaked with "--local" etc., because they wants to read also from
$HOME/.gitconfig and make sure what comes from where. Disable
reading from the system-wide config with GIT_CONFIG_NOSYSTEM=1 for
these tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t1300-repo-config.sh | 24 +++++++++++++-----------
t/t1308-config-set.sh | 1 +
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 1184f43..b998568 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -341,13 +341,11 @@ version.1.2.3eX.alpha=beta
EOF
test_expect_success 'working --list' '
- git config --list > output &&
+ git config --local --list > output &&
test_cmp expect output
'
-cat > expect << EOF
-EOF
-
-test_expect_success '--list without repo produces empty output' '
+test_expect_success '--list without repo shows only from the global' '
+ git config --system --list >expect &&
git --git-dir=nonexistent config --list >output &&
test_cmp expect output
'
@@ -360,7 +358,7 @@ version.1.2.3eX.alpha
EOF
test_expect_success '--name-only --list' '
- git config --name-only --list >output &&
+ git config --local --name-only --list >output &&
test_cmp expect output
'
@@ -370,7 +368,7 @@ nextsection.nonewline wow2 for me
EOF
test_expect_success '--get-regexp' '
- git config --get-regexp in >output &&
+ git config --local --get-regexp in >output &&
test_cmp expect output
'
@@ -380,7 +378,7 @@ nextsection.nonewline
EOF
test_expect_success '--name-only --get-regexp' '
- git config --name-only --get-regexp in >output &&
+ git config --local --name-only --get-regexp in >output &&
test_cmp expect output
'
@@ -391,7 +389,7 @@ EOF
test_expect_success '--add' '
git config --add nextsection.nonewline "wow4 for you" &&
- git config --get-all nextsection.nonewline > output &&
+ git config --local --get-all nextsection.nonewline > output &&
test_cmp expect output
'
@@ -935,7 +933,7 @@ section.quotecont=cont;inued
EOF
test_expect_success 'value continued on next line' '
- git config --list > result &&
+ git config --local --list > result &&
test_cmp result expect
'
@@ -959,7 +957,7 @@ Qsection.sub=section.val4
Qsection.sub=section.val5Q
EOF
test_expect_success '--null --list' '
- git config --null --list >result.raw &&
+ git config --null --local --list >result.raw &&
nul_to_q <result.raw >result &&
echo >>result &&
test_cmp expect result
@@ -1264,6 +1262,7 @@ test_expect_success '--show-origin with --list' '
file:.git/../include/relative.include user.relative=include
command line: user.cmdline=true
EOF
+ GIT_CONFIG_NOSYSTEM=1 \
git -c user.cmdline=true config --list --show-origin >output &&
test_cmp expect output
'
@@ -1281,6 +1280,7 @@ test_expect_success '--show-origin with --list --null' '
includeQcommand line:Quser.cmdline
trueQ
EOF
+ GIT_CONFIG_NOSYSTEM=1 \
git -c user.cmdline=true config --null --list --show-origin >output.raw &&
nul_to_q <output.raw >output &&
# The here-doc above adds a newline that the --null output would not
@@ -1304,6 +1304,7 @@ test_expect_success '--show-origin with --get-regexp' '
file:$HOME/.gitconfig user.global true
file:.git/config user.local true
EOF
+ GIT_CONFIG_NOSYSTEM=1 \
git config --show-origin --get-regexp "user\.[g|l].*" >output &&
test_cmp expect output
'
@@ -1312,6 +1313,7 @@ test_expect_success '--show-origin getting a single key' '
cat >expect <<-\EOF &&
file:.git/config local
EOF
+ GIT_CONFIG_NOSYSTEM=1 \
git config --show-origin user.override >output &&
test_cmp expect output
'
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 7655c94..5d5adb1 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -260,6 +260,7 @@ test_expect_success 'iteration shows correct origins' '
name=
scope=cmdline
EOF
+ GIT_CONFIG_NOSYSTEM=1 \
GIT_CONFIG_PARAMETERS=$cmdline_config test-config iterate >actual &&
test_cmp expect actual
'
--
2.10.0-584-gc9e068c
next prev parent reply other threads:[~2016-09-28 23:35 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 1:39 Changing the default for "core.abbrev"? Linus Torvalds
2016-09-26 3:46 ` Junio C Hamano
2016-09-26 4:34 ` Jeff King
2016-09-26 4:45 ` Junio C Hamano
2016-09-26 11:57 ` [PATCH 0/10] helping people resolve ambiguous sha1s Jeff King
2016-09-26 11:59 ` [PATCH 01/10] get_sha1: detect buggy calls with multiple disambiguators Jeff King
2016-09-26 16:37 ` Junio C Hamano
2016-09-26 17:21 ` Jeff King
2016-09-26 17:50 ` Junio C Hamano
2016-09-26 11:59 ` [PATCH 02/10] get_sha1: avoid repeating ourselves via ONLY_TO_DIE Jeff King
2016-09-26 11:59 ` [PATCH 03/10] get_sha1: propagate flags to child functions Jeff King
2016-09-26 11:59 ` [PATCH 04/10] get_short_sha1: peel tags when looking for treeish Jeff King
2016-09-26 12:11 ` Jeff King
2016-09-26 16:55 ` Junio C Hamano
2016-09-26 17:23 ` Jeff King
2016-09-26 12:00 ` [PATCH 05/10] get_short_sha1: refactor init of disambiguation code Jeff King
2016-09-26 12:00 ` [PATCH 06/10] get_short_sha1: NUL-terminate hex prefix Jeff King
2016-09-26 17:10 ` Junio C Hamano
2016-09-26 17:25 ` Jeff King
2016-09-26 17:36 ` Junio C Hamano
2016-09-26 12:00 ` [PATCH 07/10] get_short_sha1: mark ambiguity error for translation Jeff King
2016-09-26 12:00 ` [PATCH 08/10] sha1_array: let callbacks interrupt iteration Jeff King
2016-09-26 12:00 ` [PATCH 09/10] for_each_abbrev: drop duplicate objects Jeff King
2016-09-26 12:00 ` [PATCH 10/10] get_short_sha1: list ambiguous objects on error Jeff King
2016-09-26 16:36 ` Linus Torvalds
2016-09-27 5:42 ` Jacob Keller
2016-09-27 12:38 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-29 13:24 ` Jeff King
2016-09-29 14:36 ` Kyle J. McKay
2016-09-29 14:55 ` Jeff King
2016-09-26 17:30 ` Junio C Hamano
2016-09-26 17:34 ` Jeff King
2016-09-26 17:39 ` Junio C Hamano
2016-09-29 11:46 ` Kyle J. McKay
2016-09-29 13:03 ` Jeff King
2016-09-29 17:19 ` Junio C Hamano
2016-09-30 5:51 ` Jacob Keller
2019-02-04 16:12 ` [RFC/PATCH] core.abbrev doc: document and test the abbreviation length Ævar Arnfjörð Bjarmason
2019-02-04 19:13 ` Junio C Hamano
2019-02-04 20:04 ` Junio C Hamano
2019-02-04 21:36 ` Ævar Arnfjörð Bjarmason
2019-02-04 23:32 ` Jeff King
2019-02-04 23:50 ` Ævar Arnfjörð Bjarmason
2019-02-06 18:29 ` Jeff King
2019-02-06 18:36 ` Ævar Arnfjörð Bjarmason
2016-09-26 6:33 ` Changing the default for "core.abbrev"? Matthieu Moy
2016-09-26 12:09 ` Jeff King
2016-09-29 13:01 ` Kyle J. McKay
2016-09-26 7:13 ` Christian Couder
2016-09-28 23:30 ` [PATCH 0/4] raising core.abbrev default to 12 hexdigits Junio C Hamano
2016-09-28 23:30 ` [PATCH 1/4] config: allow customizing /etc/gitconfig location Junio C Hamano
2016-09-29 9:53 ` Jakub Narębski
2016-09-29 17:20 ` Junio C Hamano
2016-09-29 17:45 ` Matthieu Moy
2016-09-28 23:30 ` Junio C Hamano [this message]
2016-09-29 9:01 ` [PATCH 2/4] t13xx: do not assume system config is empty Jeff King
2016-09-29 18:13 ` Junio C Hamano
2016-09-29 18:26 ` Jeff King
2016-09-29 18:57 ` Junio C Hamano
2016-09-29 19:18 ` Jeff King
2016-09-29 19:57 ` Junio C Hamano
2016-09-29 19:06 ` Junio C Hamano
2016-09-29 19:26 ` Jeff King
2016-09-29 21:03 ` Junio C Hamano
2016-09-29 21:08 ` Jeff King
2016-09-28 23:30 ` [PATCH 3/4] worktree: honor configuration variables Junio C Hamano
2016-09-28 23:30 ` [PATCH 4/4] core.abbrev: raise the default abbreviation to 12 hexdigits Junio C Hamano
2016-09-29 2:44 ` SZEDER Gábor
2016-09-29 5:27 ` Lukas Fleischer
2016-09-29 9:22 ` Jeff King
2016-09-29 9:15 ` Jeff King
2016-09-29 10:03 ` Matthieu Moy
2016-09-29 12:52 ` SZEDER Gábor
2016-09-29 5:58 ` Johannes Sixt
2016-09-29 18:05 ` Junio C Hamano
2016-09-29 18:37 ` Linus Torvalds
2016-09-29 18:55 ` Linus Torvalds
2016-09-29 19:06 ` Linus Torvalds
2016-09-29 19:42 ` Junio C Hamano
2016-09-30 0:56 ` Mike Hommey
2016-09-30 1:01 ` Linus Torvalds
2016-09-30 19:41 ` Ævar Arnfjörð Bjarmason
2016-09-29 19:16 ` Jeff King
2016-09-29 19:40 ` Linus Torvalds
2016-09-29 19:45 ` Junio C Hamano
2016-09-29 21:53 ` Linus Torvalds
2016-09-29 23:13 ` Junio C Hamano
2016-09-29 23:20 ` Junio C Hamano
2016-09-30 0:20 ` Linus Torvalds
2016-09-30 0:28 ` Linus Torvalds
2016-09-30 0:57 ` Linus Torvalds
2016-09-30 1:18 ` Linus Torvalds
2016-09-30 3:54 ` Junio C Hamano
2016-09-30 4:10 ` Junio C Hamano
2016-09-30 4:18 ` Linus Torvalds
2016-09-30 4:29 ` Linus Torvalds
2016-09-30 4:27 ` Junio C Hamano
2016-09-30 4:35 ` Junio C Hamano
2016-09-30 18:40 ` Junio C Hamano
2016-09-30 18:51 ` Linus Torvalds
2016-09-30 19:00 ` Junio C Hamano
2016-09-30 4:11 ` Linus Torvalds
2016-09-30 8:06 ` Jeff King
2016-09-30 17:54 ` Linus Torvalds
2016-09-30 18:05 ` Jeff King
2016-09-30 18:21 ` Linus Torvalds
2016-09-30 20:01 ` Junio C Hamano
2016-09-30 17:56 ` Junio C Hamano
2016-09-30 7:47 ` Jeff King
2016-09-29 9:25 ` Jeff King
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=20160928233047.14313-3-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=torvalds@linux-foundation.org \
/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).