Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7800: add a difftool test for .git-files
author
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Mar 2014 09:23:35 +0000
(
01:23
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 5 Mar 2014 20:20:23 +0000
(12:20 -0800)
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7800-difftool.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
94eaa80
)
diff --git
a/t/t7800-difftool.sh
b/t/t7800-difftool.sh
index 2418528487624bf5497af71c9958a84e0a50328f..5a193c500d282cc2b13e8de6e128229585897a16 100755
(executable)
--- 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