diff options
| author |  Elijah Newren <newren@gmail.com> | 2011-08-11 23:19:46 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:33 -0700 |
| commit | 5b5261baab2571a207c4b7d3d9a7f583b08a7af0 (patch) | |
| tree | d164414a3402e6dc4defb1714f1a95c4665336c0 /t/t6022-merge-rename.sh | |
| parent | t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify (diff) | |
| download | tgif-5b5261baab2571a207c4b7d3d9a7f583b08a7af0.tar.xz | |
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>
Diffstat (limited to 't/t6022-merge-rename.sh')
| -rwxr-xr-x | 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 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 && |