Re: [PATCH] t6036: fix broken && chain in sub-shell

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 12, 2018, 18:48 UTC
Message-ID: <xmqq4lh4xpbm.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <c9201ced-34a8-98f4-2da6-9c36c408b501@ramsayjones.plus.com>

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

Show 8 quoted lines

> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Junio,
>
> I had a test failure on 'pu' today - Eric's chain-lint series
> found another broken chain in one of Elijah's new tests (on the
> 'en/t6036-recursive-corner-cases' branch).

Thanks, I see the same breakage in my build, too.

Show 20 quoted lines

>
> ATB,
> Ramsay Jones
>
>  t/t6036-recursive-corner-cases.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
> index 2a44acace..59e52c5a0 100755
> --- a/t/t6036-recursive-corner-cases.sh
> +++ b/t/t6036-recursive-corner-cases.sh
> @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
>  		test_write_lines 1 2 3 4 5 6 7 8 >a &&
>  		git add a &&
>  		git commit -m E3 &&
> -		git tag E3
> +		git tag E3 &&
>  
>  		git checkout C^0 &&
>  		test_must_fail git merge B^0 &&