diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-05 09:23:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-05 20:20:23 (GMT) |
| commit | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 (patch) | |
| tree | dd9023998b0196dc28e1f70a8bb8a03332344ed1 /t/t7800-difftool.sh | |
| parent | 94eaa806519498de2ca59a424b013812d72d21c5 (diff) | |
| download | git-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.zip git-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.tar.gz git-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.tar.bz2 | |
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>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 2418528..5a193c5 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 |