Merge branch 'mb/fast-import-delete-root'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index b72f6bd414b48f8cbeaf8ac8cd3109e9e9f93ad3..2b525a8e1d19cd11fea0ba06372111306ce7bf41 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"