Mike Hommey <m...@glandium.org> writes:

> Somehow, this test was using:
>
> {
>       echo A
>       echo B
> } > file
>
> block to feed file contents. This changes those to the form most common
> in git test scripts:
>
> cat >file <<-\EOF
> A
> B
> EOF
>
> Signed-off-by: Mike Hommey <m...@glandium.org>
> ---

It is not so strong a preference to ask you to re-roll, but for
future reference, I'd prefer to see this preparatory clean-up early
in the series, followed by the primary thing, IOW, I would have
liked more if the two patches were swapped.

Thanks.  Will queue.

>  t/t8003-blame-corner-cases.sh | 34 +++++++++++++++++-----------------
>  1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
> index eab2e28..e48370d 100755
> --- a/t/t8003-blame-corner-cases.sh
> +++ b/t/t8003-blame-corner-cases.sh
> @@ -41,12 +41,12 @@ test_expect_success setup '
>       test_tick &&
>       GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
>  
> -     {
> -             echo ABC
> -             echo DEF
> -             echo XXXX
> -             echo GHIJK
> -     } >cow &&
> +     cat >cow <<-\EOF &&
> +     ABC
> +     DEF
> +     XXXX
> +     GHIJK
> +     EOF
>       git add cow &&
>       test_tick &&
>       GIT_AUTHOR_NAME=Fifth git commit -m Fifth
> @@ -115,11 +115,11 @@ test_expect_success 'append with -C -C -C' '
>  test_expect_success 'blame wholesale copy' '
>  
>       git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
> -     {
> -             echo mouse-Initial
> -             echo mouse-Second
> -             echo mouse-Third
> -     } >expected &&
> +     cat >expected <<-\EOF &&
> +     mouse-Initial
> +     mouse-Second
> +     mouse-Third
> +     EOF
>       test_cmp expected current
>  
>  '
> @@ -127,12 +127,12 @@ test_expect_success 'blame wholesale copy' '
>  test_expect_success 'blame wholesale copy and more' '
>  
>       git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
> -     {
> -             echo mouse-Initial
> -             echo mouse-Second
> -             echo cow-Fifth
> -             echo mouse-Third
> -     } >expected &&
> +     cat >expected <<-\EOF &&
> +     mouse-Initial
> +     mouse-Second
> +     cow-Fifth
> +     mouse-Third
> +     EOF
>       test_cmp expected current
>  
>  '
--
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