summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-05 01:23:35 -0800
committerJunio C Hamano <gitster@pobox.com>2014-03-05 12:20:23 -0800
commitfcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 (patch)
treedd9023998b0196dc28e1f70a8bb8a03332344ed1 /t/t7800-difftool.sh
parent94eaa806519498de2ca59a424b013812d72d21c5 (diff)
downloadgit-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.tar.gz
t7800: add a difftool test for .git-filesda/difftool-git-files
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-xt/t7800-difftool.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2418528487..5a193c500d 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -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