summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-03-15 09:05:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-15 19:23:29 (GMT)
commit3c995beb14b7aef9fa724cde9d2b7a4ea4ae53cc (patch)
tree82c9fcbfda182ac72c7c6a3ba6c74c4ed93ca1a1
parent67e6d817945202427977cf950b5ccbad3060e9e4 (diff)
downloadgit-3c995beb14b7aef9fa724cde9d2b7a4ea4ae53cc.zip
git-3c995beb14b7aef9fa724cde9d2b7a4ea4ae53cc.tar.gz
git-3c995beb14b7aef9fa724cde9d2b7a4ea4ae53cc.tar.bz2
tests: suppress system gitattributes
Set GIT_ATTR_NOSYSTEM in test-lib to make tests more reliable in two ways: - an invalid GIT_ATTR_NOSYSTEM setting should not cause tests to fail with "fatal: bad config value for 'GIT_ATTR_NOSYSTEM'". - /etc/gitattributes should not change the outcome of tests. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Improved-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index e381166..00f23fc 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -948,7 +948,8 @@ GIT_TEMPLATE_DIR="$GIT_BUILD_DIR"/templates/blt
unset GIT_CONFIG
GIT_CONFIG_NOSYSTEM=1
GIT_CONFIG_NOGLOBAL=1
-export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL
+GIT_ATTR_NOSYSTEM=1
+export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOBAL GIT_ATTR_NOSYSTEM
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS