diff options
| author | Jeff King <peff@peff.net> | 2008-02-06 10:11:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-06 22:52:28 (GMT) |
| commit | 8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f (patch) | |
| tree | 9cf72109b2e90725254b774bb0a2a7796e777e74 /t | |
| parent | ab88c36321df647e17d477f19591cf6ca95de7f0 (diff) | |
| download | git-8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f.zip git-8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f.tar.gz git-8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f.tar.bz2 | |
fix config reading in tests
Previously, we set the GIT_CONFIG environment variable in
our tests so that only that file was read. However, setting
it to a static value is not correct, since we are not
necessarily always in the same directory; instead, we want
the usual git config file lookup to happen.
To do this, we stop setting GIT_CONFIG, which means that we
must now suppress the reading of the system-wide and user
configs.
This exposes an incorrect test in t1500, which is also
fixed (the incorrect test worked because we were failing to
read the core.bare value from the config file, since the
GIT_CONFIG variable was pointing us to the wrong file).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1500-rev-parse.sh | 4 | ||||
| -rw-r--r-- | t/test-lib.sh | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index e474b3f..38a2bf0 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -33,9 +33,9 @@ test_rev_parse() { test_rev_parse toplevel false false true '' cd .git || exit 1 -test_rev_parse .git/ true true false '' +test_rev_parse .git/ false true false '' cd objects || exit 1 -test_rev_parse .git/objects/ true true false '' +test_rev_parse .git/objects/ false true false '' cd ../.. || exit 1 mkdir -p sub/dir || exit 1 diff --git a/t/test-lib.sh b/t/test-lib.sh index da47bd7..83889c4 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -324,8 +324,11 @@ test_done () { PATH=$(pwd)/..:$PATH GIT_EXEC_PATH=$(pwd)/.. GIT_TEMPLATE_DIR=$(pwd)/../templates/blt -GIT_CONFIG=.git/config -export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG +unset GIT_CONFIG +unset GIT_CONFIG_LOCAL +GIT_CONFIG_NOSYSTEM=1 +GIT_CONFIG_NOGLOBAL=1 +export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git export GITPERLLIB |