t7800: cleanup cruft left behind by tests

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index e1ec2927180300e206d3d47a341aac052f1812db..e0e65df8de6dc5a468ea7ead2268628effb9361e 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -591,6 +591,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
 '
 
 test_expect_success 'difftool properly honors gitlink and core.worktree' '
 '
 
 test_expect_success 'difftool properly honors gitlink and core.worktree' '

+       test_when_finished rm -rf submod/ule &&

        git submodule add ./. submod/ule &&
        test_config -C submod/ule diff.tool checktrees &&
        test_config -C submod/ule difftool.checktrees.cmd '\''
        git submodule add ./. submod/ule &&
        test_config -C submod/ule diff.tool checktrees &&
        test_config -C submod/ule difftool.checktrees.cmd '\''


@@ -600,11 +601,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
                cd submod/ule &&
                echo good >expect &&
                git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
                cd submod/ule &&
                echo good >expect &&
                git difftool --tool=checktrees --dir-diff HEAD~ >actual &&

-               test_cmp expect actual
+               test_cmp expect actual &&
+               rm -f expect actual

        )
 '
 
 test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
        )
 '
 
 test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '

+       test_when_finished git reset --hard &&

        git init dirlinks &&
        (
                cd dirlinks &&
        git init dirlinks &&
        (
                cd dirlinks &&