File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -591,6 +591,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
591
591
'
592
592
593
593
test_expect_success ' difftool properly honors gitlink and core.worktree' '
594
+ test_when_finished rm -rf submod/ule &&
594
595
git submodule add ./. submod/ule &&
595
596
test_config -C submod/ule diff.tool checktrees &&
596
597
test_config -C submod/ule difftool.checktrees.cmd ' \' '
@@ -600,11 +601,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
600
601
cd submod/ule &&
601
602
echo good >expect &&
602
603
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
603
- test_cmp expect actual
604
+ test_cmp expect actual &&
605
+ rm -f expect actual
604
606
)
605
607
'
606
608
607
609
test_expect_success SYMLINKS ' difftool --dir-diff symlinked directories' '
610
+ test_when_finished git reset --hard &&
608
611
git init dirlinks &&
609
612
(
610
613
cd dirlinks &&
You can’t perform that action at this time.
0 commit comments