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 @@ -610,6 +610,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
610
610
'
611
611
612
612
test_expect_success ' difftool properly honors gitlink and core.worktree' '
613
+ test_when_finished rm -rf submod/ule &&
613
614
git submodule add ./. submod/ule &&
614
615
test_config -C submod/ule diff.tool checktrees &&
615
616
test_config -C submod/ule difftool.checktrees.cmd ' \' '
@@ -619,11 +620,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
619
620
cd submod/ule &&
620
621
echo good >expect &&
621
622
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
622
- test_cmp expect actual
623
+ test_cmp expect actual &&
624
+ rm -f expect actual
623
625
)
624
626
'
625
627
626
628
test_expect_success SYMLINKS ' difftool --dir-diff symlinked directories' '
629
+ test_when_finished git reset --hard &&
627
630
git init dirlinks &&
628
631
(
629
632
cd dirlinks &&
You can’t perform that action at this time.
0 commit comments