SZEDER Gábor <szeder....@gmail.com> writes:

> In the test 'checkout with autocrlf=input' in 't0020-crlf.sh', one of
> the 'has_cr' checks looks at the non-existing file 'two' instead of
> 'dir/two'.  The test still succeeds, without actually checking what it
> was supposed to, because this check is expected to fail anyway.
>
> As a minimal fix, fix the name of the file to be checked.
>
> Signed-off-by: SZEDER Gábor <szeder....@gmail.com>
> ---

This originates from fd777141 ("t0020: fix ignored exit code inside
loops", 2015-03-25) where a loop

    for f in one dir/two
    do
            do things on "$f" || break
    done

was unrolled to correctly break out of the &&-chain.  The filenames
on the update-index line correctly copied one and dir/two, but the
has_cr line somehow lost dir/ prefix.

Thanks.  Will queue.

>  t/t0020-crlf.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
> index 5f056982a5..854da0ae16 100755
> --- a/t/t0020-crlf.sh
> +++ b/t/t0020-crlf.sh
> @@ -160,7 +160,7 @@ test_expect_success 'checkout with autocrlf=input' '
>       git config core.autocrlf input &&
>       git read-tree --reset -u HEAD &&
>       test_must_fail has_cr one &&
> -     test_must_fail has_cr two &&
> +     test_must_fail has_cr dir/two &&
>       git update-index -- one dir/two &&
>       test "$one" = $(git hash-object --stdin <one) &&
>       test "$two" = $(git hash-object --stdin <dir/two) &&

Reply via email to