Skip to content

Commit

Permalink
t7800: "defaults" is no longer a builtin tool name
Browse files Browse the repository at this point in the history
073678b 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>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Feb 21, 2013
1 parent e42360c commit f469e84
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t7800-difftool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

Expand Down

0 comments on commit f469e84

Please sign in to comment.