Merge branch 'js/fast-export-paths-with-spaces' into maint

diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 585f8d5751eb1fba2c1ca4c7c5cf7189570d2f2e..bc2eeb094485b4e0865c910399488e48d0570722 100755 (executable)
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -8,7 +8,9 @@ This test verifies the basic operation of the merge, pull, add
 and split subcommands of git subtree.
 '
 
-. ./test-lib.sh
+export TEST_DIRECTORY=$(pwd)/../../../t
+
+. ../../../t/test-lib.sh
 
 create()
 {
@@ -30,7 +32,7 @@ check_equal()
 }
 
 fixnl()
-{      
+{
        t=""
        while read x; do
                t="$t$x "