{"thread":{"id":"32967","subject":"[PATCH v4 4/4] t7800: \"defaults\" is no longer a builtin tool name","startedAt":"2013-02-21T23:32:52Z","lastAt":"2013-02-21T23:49:15Z","messageCount":2,"participants":["David Aguilar","Junio C Hamano"],"isPatch":true,"patchVersion":4,"patchTotal":4},"messages":[{"id":"210007","messageId":"1361489572-25403-1-git-send-email-davvid@gmail.com","threadId":"32967","inReplyTo":null,"subject":"[PATCH v4 4/4] t7800: \"defaults\" is no longer a builtin tool name","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2013-02-21T23:32:52Z","receivedAt":"2013-02-21T23:32:52Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"073678b8e6324a155fa99f40eee0637941a70a34 reworked the\nmergetools/ directory so that every file corresponds to a\ndifftool-supported tool.  When this happened the \"defaults\"\nfile went away as it was no longer needed by mergetool--lib.\n\nt7800 tests that configured commands can override builtins,\nbut this test was not adjusted when the \"defaults\" file was\nremoved because the test continued to pass.\n\nAdjust the test to use the everlasting \"vimdiff\" tool name\ninstead of \"defaults\" so that it correctly tests against a tool\nthat is known by mergetool--lib.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nReplacement patch to fix my botched rebase.\n\n t/t7800-difftool.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh\nindex fb00273..3aab6e1 100755\n--- a/t/t7800-difftool.sh\n+++ b/t/t7800-difftool.sh\n@@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' '\n '\n \n test_expect_success PERL 'custom tool commands override built-ins' '\n-\ttest_config difftool.defaults.cmd \"cat \\\"\\$REMOTE\\\"\" &&\n+\ttest_config difftool.vimdiff.cmd \"cat \\\"\\$REMOTE\\\"\" &&\n \techo master >expect &&\n-\tgit difftool --tool defaults --no-prompt branch >actual &&\n+\tgit difftool --tool vimdiff --no-prompt branch >actual &&\n \ttest_cmp expect actual\n '\n \n-- \n1.8.2.rc0.20.gf548dd7\n"},{"id":"210010","messageId":"7vy5ehrzwk.fsf@alter.siamese.dyndns.org","threadId":"32967","inReplyTo":"1361489572-25403-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH v4 4/4] t7800: \"defaults\" is no longer a builtin tool name","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-21T23:49:15Z","receivedAt":"2013-02-21T23:49:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}