diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-05 01:23:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-05 12:20:23 -0800 |
| commit | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 (patch) | |
| tree | dd9023998b0196dc28e1f70a8bb8a03332344ed1 | |
| parent | difftool: support repositories with .git-files (diff) | |
| download | tgif-fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946.tar.xz | |
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>
| -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 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 |