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 <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 11, 2011 at 23:19 UTC
5b5261baab2571a207c4b7d3d9a7f583b08a7af0
1 file changed
+1
t/t6022-merge-rename.sh
+1
@@ -252,6 +252,7 @@ test_expect_success 'setup for rename + d/f conflicts' '
252
git reset --hard &&
253
git checkout --orphan dir-in-way &&
254
git rm -rf . &&
255
+ git clean -fdqx &&
256
257
mkdir sub &&
258
mkdir dir &&