Skip to content

Commit 98fde5e

Browse files
davvidgitster
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 8d8061d commit 98fde5e

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
@@ -591,6 +591,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
591591
'
592592

593593
test_expect_success 'difftool properly honors gitlink and core.worktree' '
594+
test_when_finished rm -rf submod/ule &&
594595
git submodule add ./. submod/ule &&
595596
test_config -C submod/ule diff.tool checktrees &&
596597
test_config -C submod/ule difftool.checktrees.cmd '\''
@@ -600,11 +601,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
600601
cd submod/ule &&
601602
echo good >expect &&
602603
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
603-
test_cmp expect actual
604+
test_cmp expect actual &&
605+
rm -f expect actual
604606
)
605607
'
606608

607609
test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
610+
test_when_finished git reset --hard &&
608611
git init dirlinks &&
609612
(
610613
cd dirlinks &&

0 commit comments

Comments
 (0)