summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-12 05:19:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-14 21:19:33 (GMT)
commit5b5261baab2571a207c4b7d3d9a7f583b08a7af0 (patch)
treed164414a3402e6dc4defb1714f1a95c4665336c0
parent0b35deb378ee471f64e1b376d722e0bdd97d5e36 (diff)
downloadgit-5b5261baab2571a207c4b7d3d9a7f583b08a7af0.zip
git-5b5261baab2571a207c4b7d3d9a7f583b08a7af0.tar.gz
git-5b5261baab2571a207c4b7d3d9a7f583b08a7af0.tar.bz2
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>
-rwxr-xr-xt/t6022-merge-rename.sh1
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 &&