Re: [RFC/ PATCH 4/5] t3030: update porcelain expected message

[Junio C Hamano <gitster@pobox.com>]

Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:

> From: Diane <diane.gasselin@ensimag.imag.fr>
>
> As porcelain messages have been changed, the expected porcelain message
> tested in this test needs to be changed.
>
> Signed-off-by: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
> Signed-off-by: Axel Bonnet <axel.bonnet@ensimag.imag.fr>
> Signed-off-by: Clément Poulain <clement.poulain@ensimag.imag.fr>
> ---
>  t/t3030-merge-recursive.sh |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
> index 9929f82..9ac5df8 100755
> --- a/t/t3030-merge-recursive.sh
> +++ b/t/t3030-merge-recursive.sh
> @@ -268,6 +268,11 @@ test_expect_success 'merge-recursive result' '
>  	test_cmp expected actual
>  
>  '
> +cat> expected2 <<EOF

Style:

 (1) redirection ">" and "<" stick to the target file and have a SP on the
     other end.

 (2) if you are not actively $substituting inside here document,
     quote EOF to assure readers that nothing funny is going on.

i.e.

	cat >expected2 <<\EOF
        ... your HERE document here ...
	EOF

The same comment applies to [PATCH 5/5].  Also when you want to create an
empty file, don't use "touch F"; say ">F" instead.

> -	grep "Your local changes to .* would be overwritten by merge." out
> +	grep -A 2 "Your local changes to" out > tmp &&

I think "grep -A $n" is a GNUism, not even in POSIX.  Avoid it.

Perhaps

	sed -n "/^Your local changes to/,\$p" out >tmp &&