t7800: cleanup cruft left behind by tests
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Mar 14, 2017 at 23:54 UTC
98fde5e47b684c7be28e5c0c2a80354cf088d41d
1 file changed
+4
-1
t/t7800-difftool.sh
+4
-1
@@ -591,6 +591,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
591
'
592
593
test_expect_success 'difftool properly honors gitlink and core.worktree' '
594
+ test_when_finished rm -rf submod/ule &&
595
git submodule add ./. submod/ule &&
596
test_config -C submod/ule diff.tool checktrees &&
597
test_config -C submod/ule difftool.checktrees.cmd '\''
@@ -600,11 +601,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
601
cd submod/ule &&
602
echo good >expect &&
603
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
603
- test_cmp expect actual
604
+ test_cmp expect actual &&
605
+ rm -f expect actual
606
)
607
'
608
609
test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
610
+ test_when_finished git reset --hard &&
611
git init dirlinks &&
612
(
613
cd dirlinks &&