[PATCH] t7800: add a difftool test for .git-files
From: David Aguilar <hidden>
Date: 2016-06-15 23:00:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Junio C Hamano <redacted> Signed-off-by: David Aguilar <redacted> --- This is a replacement patch for the current tip of da/difftool. t/t7800-difftool.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 2418528..986b78e 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
--
1.8.5.5.2.g42fdfc9