Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit fcfec8b

Browse files
committed
t7800: add a difftool test for .git-files
Signed-off-by: David Aguilar <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 94eaa80 commit fcfec8b

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

t/t7800-difftool.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,4 +434,18 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
434434
)
435435
'
436436

437+
test_expect_success PERL 'difftool properly honors gitlink and core.worktree' '
438+
git submodule add ./. submod/ule &&
439+
(
440+
cd submod/ule &&
441+
test_config diff.tool checktrees &&
442+
test_config difftool.checktrees.cmd '\''
443+
test -d "$LOCAL" && test -d "$REMOTE" && echo good
444+
'\'' &&
445+
echo good >expect &&
446+
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
447+
test_cmp expect actual
448+
)
449+
'
450+
437451
test_done

0 commit comments

Comments
 (0)