diff options
| author | David Aguilar <davvid@gmail.com> | 2017-03-15 06:54:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-15 18:57:29 (GMT) |
| commit | 98fde5e47b684c7be28e5c0c2a80354cf088d41d (patch) | |
| tree | 76971cae21cc156f5108ee3bf3112f28fb4031b9 /t/t7800-difftool.sh | |
| parent | 8d8061d642f5c6b1b9183ffaa041d0d013ff4be3 (diff) | |
| download | git-98fde5e47b684c7be28e5c0c2a80354cf088d41d.zip git-98fde5e47b684c7be28e5c0c2a80354cf088d41d.tar.gz git-98fde5e47b684c7be28e5c0c2a80354cf088d41d.tar.bz2 | |
t7800: cleanup cruft left behind by tests
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index e1ec292..e0e65df 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -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 && |