Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index fdad7dad611b385f05779826bfa74f33d1f28d03..91bb5e1d9eea0b2f1ff7a1120d97ca2876a8f277 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -9,7 +9,8 @@ This test runs git rebase and checks that the author information is not lost.
 '
 . ./test-lib.sh
 
-export GIT_AUTHOR_EMAIL=bogus_email_address
+GIT_AUTHOR_EMAIL=bogus_email_address
+export GIT_AUTHOR_EMAIL
 
 test_expect_success \
     'prepare repository with topic branches' \