diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:26:52 -0700 |
| commit | 26696382ecc3fd9895da117311d234501127cf81 (patch) | |
| tree | ceaf3a3bf3d488b408eb51903af06c0fc0714df8 /t | |
| parent | 13b49f1e7463c46272c0b3b9b1952dc519086b6d (diff) | |
| parent | fcfec8bd9a9bf0a0f36ba4aed85f5768988aa946 (diff) | |
| download | git-26696382ecc3fd9895da117311d234501127cf81.tar.gz | |
Merge branch 'da/difftool-git-files'
"git difftool" misbehaved when the repository is bound to the
working tree with the ".git file" mechanism, where a textual
file ".git" tells us where it is.
* da/difftool-git-files:
t7800: add a difftool test for .git-files
difftool: support repositories with .git-files
Diffstat (limited to 't')
| -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 |