Skip to content

Commit

Permalink
t7800: cleanup cruft left behind by tests
Browse files Browse the repository at this point in the history
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
davvid authored and dscho committed Apr 26, 2017
1 parent 9f22cae commit ede8f14
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion t/t7800-difftool.sh
Expand Up @@ -610,6 +610,7 @@ test_expect_success 'difftool --no-symlinks detects conflict ' '
'

test_expect_success 'difftool properly honors gitlink and core.worktree' '
test_when_finished rm -rf submod/ule &&
git submodule add ./. submod/ule &&
test_config -C submod/ule diff.tool checktrees &&
test_config -C submod/ule difftool.checktrees.cmd '\''
Expand All @@ -619,11 +620,13 @@ test_expect_success 'difftool properly honors gitlink and core.worktree' '
cd submod/ule &&
echo good >expect &&
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
test_cmp expect actual
test_cmp expect actual &&
rm -f expect actual
)
'

test_expect_success SYMLINKS 'difftool --dir-diff symlinked directories' '
test_when_finished git reset --hard &&
git init dirlinks &&
(
cd dirlinks &&
Expand Down

0 comments on commit ede8f14

Please sign in to comment.