On Fri, Jun 13, 2014 at 01:23:47PM -0700, Junio C Hamano wrote:

> This passes with your shell set to dash but fails with bash.
> 
> Let's fix it up like so.

Thanks, I should have been more suspicious of the combination of backslashes
and echo during review. :)

> diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
> index 5ef5ad3..39e55a1 100755
> --- a/t/t0008-ignores.sh
> +++ b/t/t0008-ignores.sh
> @@ -816,12 +816,14 @@ test_expect_success NOT_MINGW,NOT_CYGWIN 'correct 
> handling of backslashes' '
>       >"whitespace/trailing 5 \\ \\ " &&
>       >"whitespace/trailing 6 \\a\\" &&
>       >whitespace/untracked &&
> -     echo "whitespace/trailing 1 \\    " >ignore  &&
> -     echo "whitespace/trailing 2 \\\\\\\\\\\\\\\\" >>ignore &&
> -     echo "whitespace/trailing 3 \\\\\\\\\\\\\\\\ " >>ignore &&
> -     echo "whitespace/trailing 4   \\\\\\\\\\\\    " >>ignore &&
> -     echo "whitespace/trailing 5 \\\\\\\\ \\\\\\\\\\\\   " >>ignore &&
> -     echo "whitespace/trailing 6 \\\\\\\\a\\\\\\\\" >>ignore &&
> +     sed -e "s/Z$//" >ignore <<-\EOF &&
> +     whitespace/trailing 1 \    Z
> +     whitespace/trailing 2 \\\\Z
> +     whitespace/trailing 3 \\\\ Z
> +     whitespace/trailing 4   \\\    Z
> +     whitespace/trailing 5 \\ \\\   Z
> +     whitespace/trailing 6 \\a\\Z
> +     EOF

The end result is much more readable, too, IMHO.

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to