Merge branch 'maint-1.7.0' into maint

diff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh
index f072a8ed48ce87267c72635f417bc0b3ebe03f19..da6252b1179c47d39393c983d88c75d84a507cb7 100755 (executable)
--- a/t/t1501-worktree.sh
+++ b/t/t1501-worktree.sh
@@ -343,7 +343,7 @@ test_expect_success 'make_relative_path handles double slashes in GIT_DIR' '
 test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' '
        GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \
        test-subprocess --setup-work-tree rev-parse --show-toplevel >actual &&
-       echo "$TRASH_DIRECTORY/repo.git/work" >expected &&
+       echo "$(pwd)/repo.git/work" >expected &&
        test_cmp expected actual
 '