From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 24 Sep 2010 23:02:29 GMT
Subject: Re: [RFC PATCHv2 15/16] t7800 (difftool): add missing &&
Message-ID: <AANLkTikW8DBGybpE_+_zhqFi2XM0bu3YcqBkx3oZNhdB@mail.gmail.com>
In-Reply-To: <1285366976-22216-16-git-send-email-newren@gmail.com>

On Fri, Sep 24, 2010 at 22:22, Elijah Newren <newren@gmail.com> wrote:

>  test_expect_success PERL 'difftool --extcmd echo arg1' '
> -       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch)
> +       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch) &&
>        test "$diff" = file
>  '
>
>  test_expect_success PERL 'difftool --extcmd cat arg1' '
> -       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch)
> +       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch) &&
>        test "$diff" = master
>  '
>
>  test_expect_success PERL 'difftool --extcmd cat arg2' '
> -       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch)
> +       diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch) &&
>        test "$diff" = branch
>  '

Maybe better to change these all to:

    echo branch >expect &&
    git difftool ... >actual &&
    test_cmp expect actual

Or maybe do that in a later series, since it's not on-topic for this
one.