Sync with 2.5.3

diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index 0c801296567bbeb8fc8944ad50df03d88b9df5fd..553a3f601ba7c76efa193d4a33823197c05281e7 100755 (executable)
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -242,7 +242,7 @@ say "auto bare gitdir"
 # DESTROYYYYY!!!!!
 test_expect_success 'setup' '
        rm -rf /refs /objects /info /hooks &&
-       rm /* &&
+       rm -f /expected /ls.expected /me /result &&
        cd / &&
        echo "Initialized empty Git repository in /" > expected &&
        git init --bare > result &&