Merge branch 'maint'

diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh
index 2f8014a60ef07d84430b9a696d46cd63c4822524..dc92e60cd6f09fa5e2610d491cf1c07d43c45dfd 100755 (executable)
--- a/t/t9808-git-p4-chdir.sh
+++ b/t/t9808-git-p4-chdir.sh
@@ -21,7 +21,7 @@ test_expect_success 'init depot' '
 # environment variable is set
 test_expect_success 'P4CONFIG and absolute dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&
@@ -33,7 +33,7 @@ test_expect_success 'P4CONFIG and absolute dir clone' '
 # same thing, but with relative directory name, note missing $ on --dest
 test_expect_success 'P4CONFIG and relative dir clone' '
        printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
-       test_when_finished "rm \"$TRASH_DIRECTORY/p4config\"" &&
+       test_when_finished "rm p4config" &&
        test_when_finished cleanup_git &&
        (
                P4CONFIG=p4config && export P4CONFIG &&