mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t7800: add a difftool test for .git-files
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
94eaa80651
commit
fcfec8bd9a
|
@ -434,4 +434,18 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
|
|||
)
|
||||
'
|
||||
|
||||
test_expect_success PERL 'difftool properly honors gitlink and core.worktree' '
|
||||
git submodule add ./. submod/ule &&
|
||||
(
|
||||
cd submod/ule &&
|
||||
test_config diff.tool checktrees &&
|
||||
test_config difftool.checktrees.cmd '\''
|
||||
test -d "$LOCAL" && test -d "$REMOTE" && echo good
|
||||
'\'' &&
|
||||
echo good >expect &&
|
||||
git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue