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@xxxxxxxxx> --- t/t7800-difftool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 2d1ba8d..6307c36 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -59,9 +59,9 @@ test_expect_success PERL 'custom commands' ' # Ensures that a custom difftool.<tool>.cmd overrides built-ins test_expect_success PERL 'custom commands override built-ins' ' - test_config difftool.defaults.cmd "cat \$REMOTE" && + test_config difftool.vimdiff.cmd "cat \$REMOTE" && - diff=$(git difftool --tool defaults --no-prompt branch) && + diff=$(git difftool --tool vimdiff --no-prompt branch) && test "$diff" = "master" ' -- 1.8.1.3.623.g622c8fc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html