Skip to content

Commit ede8f14

Browse files
davviddscho
authored andcommitted
t7800: cleanup cruft left behind by tests
Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9f22cae commit ede8f14

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

t/t7800-difftool.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
610610
'
611611

612612
test_expect_success 'difftool properly honors gitlink and core.worktree' '
613+
test_when_finished rm -rf submod/ule &&
613614
git submodule add ./. submod/ule &&
614615
test_config -C submod/ule diff.tool checktrees &&
615616
test_config -C submod/ule difftool.checktrees.cmd '\''
@@ -619,11 +620,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
619620
cd submod/ule &&
620621
echo good >expect &&
621622
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
622-
test_cmp expect actual
623+
test_cmp expect actual &&
624+
rm -f expect actual
623625
)
624626
'
625627

626628
test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
629+
test_when_finished git reset --hard &&
627630
git init dirlinks &&
628631
(
629632
cd dirlinks &&

0 commit comments

Comments
 (0)