On Fri, Sep 24, 2010 at 22:22, Elijah Newren <newren@xxxxxxxxx> 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.
--
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