From 5b5261baab2571a207c4b7d3d9a7f583b08a7af0 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Thu, 11 Aug 2011 23:19:46 -0600 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t6022-merge-rename.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index 1ed259d86..1d1b32ede 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 && -- 2.26.2