diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-16 17:56:51 -0800 |
| commit | fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 (patch) | |
| tree | a3c4cf94132da5755e874ef44bd8072d679ba0c8 /t | |
| parent | 093d50e0d226b879e24753ce18f4eb4b754807c6 (diff) | |
| parent | 8bfa6bd6473b086ab2c5781daa08a7b5417c3d1f (diff) | |
| download | git-fef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4.tar.gz | |
Merge branch 'jk/noetcconfig'
* jk/noetcconfig:
fix config reading in tests
allow suppressing of global and system config
Conflicts:
cache.h
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 e474b3f1d5..38a2bf09af 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 da47bd7c9e..83889c4f46 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 |