Merge branch 'jn/rebase-cmdline-fix'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 9bfa14be7f1c3935013d04318eeaecc68b4ef88c..454880ac7d281d901156136900814dee9aae46c5 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -473,6 +473,9 @@ test_external () {
                # Announce the script to reduce confusion about the
                # test output that follows.
                say_color "" " run $test_count: $descr ($*)"
+               # Export TEST_DIRECTORY, TRASH_DIRECTORY and GIT_TEST_LONG
+               # to be able to use them in script
+               export TEST_DIRECTORY TRASH_DIRECTORY GIT_TEST_LONG
                # Run command; redirect its stderr to &4 as in
                # test_run_, but keep its stdout on our stdout even in
                # non-verbose mode.