diff options
| author | David Aguilar <davvid@gmail.com> | 2013-02-21 15:32:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-21 15:43:58 -0800 |
| commit | f469e8404a625067fd3442c816771ac3ad9055ff (patch) | |
| tree | bc643e883fb068eb609aad90e4d73cfa566e5889 /t/t7800-difftool.sh | |
| parent | e42360c48eebc633b1536904839a1a073780ad8a (diff) | |
| download | git-f469e8404a625067fd3442c816771ac3ad9055ff.tar.gz | |
t7800: "defaults" is no longer a builtin tool name
073678b8e6324a155fa99f40eee0637941a70a34 reworked the
mergetools/ directory so that every file corresponds to a
difftool-supported tool. When this happened the "defaults"
file went away as it was no longer needed by mergetool--lib.
t7800 tests that configured commands can override builtins,
but this test was not adjusted when the "defaults" file was
removed because the test continued to pass.
Adjust the test to use the everlasting "vimdiff" tool name
instead of "defaults" so that it correctly tests against a tool
that is known by mergetool--lib.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index fb0027325d..3aab6e1500 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' ' ' test_expect_success PERL 'custom tool commands override built-ins' ' - test_config difftool.defaults.cmd "cat \"\$REMOTE\"" && + test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" && echo master >expect && - git difftool --tool defaults --no-prompt branch >actual && + git difftool --tool vimdiff --no-prompt branch >actual && test_cmp expect actual ' |