summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-03-20 19:15:54 -0400
committerJunio C Hamano <gitster@pobox.com>2014-03-21 14:26:22 -0700
commit551a3e60d1cb9dca37a3a789cf1a4b94074ce6c5 (patch)
tree531a06a3ad944b2d2862a197b0509733e05e0a10
parent3cc6a6f0f7519733deeebe17d7a19a53e9c02028 (diff)
downloadgit-551a3e60d1cb9dca37a3a789cf1a4b94074ce6c5.tar.gz
t: prefer "git config --file" to GIT_CONFIG with test_must_fail
This lets us get rid of an extra "env" invocation in the middle, and is slightly more readable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1300-repo-config.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index cd23d07029..e355aa1c97 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -961,15 +961,15 @@ test_expect_success SYMLINKS 'symlinked configuration' '
'
test_expect_success 'nonexistent configuration' '
- test_must_fail env GIT_CONFIG=doesnotexist git config --list &&
- test_must_fail env GIT_CONFIG=doesnotexist git config test.xyzzy
+ test_must_fail git config --file=doesnotexist --list &&
+ test_must_fail git config --file=doesnotexist test.xyzzy
'
test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
ln -s doesnotexist linktonada &&
ln -s linktonada linktolinktonada &&
- test_must_fail env GIT_CONFIG=linktonada git config --list &&
- test_must_fail env GIT_CONFIG=linktolinktonada git config --list
+ test_must_fail git config --file=linktonada --list &&
+ test_must_fail git config --file=linktolinktonada --list
'
test_expect_success 'check split_cmdline return' "