Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/t/test-lib.sh b/t/test-lib.sh
index a4795373a6a2e1f247b3cef9880f2a82309b3594..b1bc65bfb564ca85d35c42071f825360d1998392 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -109,6 +109,10 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
 export EDITOR
 
+# Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output
+GIT_TRACE_BARE=1
+export GIT_TRACE_BARE
+
 if test -n "${TEST_GIT_INDEX_VERSION:+isset}"
 then
        GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"