summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2015-08-05 11:43:51 +0200
committerJunio C Hamano <gitster@pobox.com>2015-08-05 13:00:04 -0700
commitfaacc5aa7c3d9c0695bf0203b55c4fd77cd5cda3 (patch)
tree597342ddbb7fd9e9db1b073f5b47b38e02092b86
parent24ca45f64cf90a91597a94c85a11a69d030e0389 (diff)
downloadgit-ps/t1509-chroot-test-fixup.tar.gz
tests: fix cleanup after tests in t1509-root-worktreeps/t1509-chroot-test-fixup
During cleanup we do a simple 'rm /*' to remove leftover files from previous tests. As 'rm' errors out when there is anything it cannot delete and there are directories present at '/' it will throw an error, causing the '&&' chain to fail. Fix this by explicitly removing the files. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1509-root-worktree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index 0c80129656..553a3f601b 100755
--- 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 &&