Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh
index 99857210555288cf5ca8f4fa4d1e94bfe557fbd2..86c376088ccd04d0b0cbb14424eef7a9b89b45d3 100755 (executable)
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -185,8 +185,8 @@ test_expect_success 'submodule fast-export | fast-import' '
 
 '
 
-export GIT_AUTHOR_NAME='A U Thor'
-export GIT_COMMITTER_NAME='C O Mitter'
+GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
+GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
 
 test_expect_success 'setup copies' '