Andrew's git / gitweb.git / diff
?
tests: suppress system gitattributes
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 15 Mar 2011 09:05:10 +0000 (04:05 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 19:23:29 +0000 (12:23 -0700)
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>
t/test-lib.sh patch | blob | history
diff --git a/t/test-lib.sh b/t/test-lib.sh
index e381166f5d306d510e9097e74476b36414d62bb0..00f23fc975eaea72e5502e377339bb37cde4ae71 100644 (file)
--- 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