undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7800: cleanup cruft left behind by tests

Browse Source 
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2017-03-14 23:54:05 -07:00 committed by Junio C Hamano
parent 8d8061d642
commit 98fde5e47b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t7800-difftool.sh
View File

@ -591,6 +591,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 '\''
@ -600,11 +601,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 &&