Re: [PATCH v3 4/4] t7800: "defaults" is no longer a builtin tool name

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 21, 2013, 05:00 UTC
Message-ID: <7vzjyyw9bi.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1361419428-22410-4-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

Show 15 quoted lines

> 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