From: Patrick Steinhardt <ps@pks.im>
Date: Wed, 5 Aug 2015 09:43:51 +0000 (+0200)
Subject: tests: fix cleanup after tests in t1509-root-worktree
X-Git-Tag: v2.6.0-rc0~63^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=faacc5aa7c3d9c0695bf0203b55c4fd77cd5cda3;p=thirdparty%2Fgit.git

tests: fix cleanup after tests in t1509-root-worktree

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>
---

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 &&