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>
Junio C Hamano committed
Mar 5, 2014 at 01:23 UTC
fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946
1 file changed
+14
t/t7800-difftool.sh
+14
@@ -434,4 +434,18 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
434
)
435
'
436
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
+
451
test_done