Merge branch 'ew/svn-maint-fixes'

diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index 11502b750997aba0ecfb6aa5b07c9aad1c45d592..dae327fabbfe390a3dc707ef2ebc665c9c6e3cb3 100755 (executable)
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -11,7 +11,7 @@ test_description='Rename interaction with pathspec.
 
 test_expect_success 'prepare reference tree' '
        mkdir path0 path1 &&
-       cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+       cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
        git update-index --add path0/COPYING &&
        tree=$(git write-tree) &&
        echo $tree