From: Elijah Newren <redacted>
Date: Fri, 12 Aug 2011 05:19:46 +0000 (-0600)
Subject: t6022: Remove unnecessary untracked files to make test cleaner
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5b5261baab2571a207c4b7d3d9a7f583b08a7af0;p=git.git

t6022: Remove unnecessary untracked files to make test cleaner

Since this test later does a git add -A, we should clean out unnecessary
untracked files as part of our cleanup.

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 1ed259d864..1d1b32eded 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -252,6 +252,7 @@ test_expect_success 'setup for rename + d/f conflicts' '
 	git reset --hard &&
 	git checkout --orphan dir-in-way &&
 	git rm -rf . &&
+	git clean -fdqx &&
 
 	mkdir sub &&
 	mkdir dir &&