From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Mar 2014 09:23:35 +0000 (-0800)
Subject: t7800: add a difftool test for .git-files
X-Git-Tag: v1.9.1~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946;p=thirdparty%2Fgit.git

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>
---

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