From: Elijah Newren Date: Wed, 08 Jun 2011 07:30:43 GMT Subject: [PATCH 13/48] t6022: Remove unnecessary untracked files to make test cleaner Message-ID: <1307518278-23814-14-git-send-email-newren@gmail.com> In-Reply-To: <1307518278-23814-1-git-send-email-newren@gmail.com> 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 --- t/t6022-merge-rename.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 1ed259d..1d1b32e 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 && -- 1.7.6.rc0.62.g2d69f