On Wed, Feb 20, 2013 at 9:00 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > David Aguilar <davvid@xxxxxxxxx> writes: > >> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh >> index fb00273..21fbba9 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 "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 >> ' > > Eek. > > $ sh t7800-difftool.sh -i > ok 1 - setup > ok 2 - custom commands > not ok 3 - custom tool commands override built-ins > # > # test_config difftool.vimdiff "cat \"\$REMOTE\"" && > # echo master >expect && > # git difftool --tool vimdiff --no-prompt branch >actual && > # test_cmp expect actual > # > > Running the same test with "-v" seems to get stuck with this > forever: > > expecting success: > test_config difftool.vimdiff "cat \"\$REMOTE\"" && > echo master >expect && > git difftool --tool vimdiff --no-prompt branch >actual && > test_cmp expect actual > > Vim: Warning: Output is not to a terminal > Vim: Warning: Input is not from a terminal > Oh boy. I botched the rebase. I have a replacement. I thought I re-ran the tests! I'll resend it. -- David -- 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