Re: [PATCH] t5526: fix some broken && chains

From: Stefan Beller <sbeller@google.com>
Date: Aug 17, 2017, 17:44 UTC
Message-ID: <CAGZ79kY2xc+-63m7upVLrEkHLVgL3hGtTKOKnJPjgReCO_Aj2g@mail.gmail.com>
In-Reply-To: <20170817103613.GB52233@book.hvoigt.net>

On Thu, Aug 17, 2017 at 3:36 AM, Heiko Voigt <hvoigt@hvoigt.net> wrote:

> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>

Reviewed-by: Stefan Beller <sbeller@google.com>

Thanks, Stefan

Show 47 quoted lines

> ---
>  t/t5526-fetch-submodules.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
> index ce788e9..22a7358 100755
> --- a/t/t5526-fetch-submodules.sh
> +++ b/t/t5526-fetch-submodules.sh
> @@ -193,7 +193,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
>         add_upstream_commit &&
>         (
>                 cd downstream &&
> -               git config fetch.recurseSubmodules true
> +               git config fetch.recurseSubmodules true &&
>                 git fetch >../actual.out 2>../actual.err
>         ) &&
>         test_must_be_empty actual.out &&
> @@ -218,7 +218,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
>         add_upstream_commit &&
>         (
>                 cd downstream &&
> -               git config fetch.recurseSubmodules true
> +               git config fetch.recurseSubmodules true &&
>                 git fetch --no-recurse-submodules >../actual.out 2>../actual.err
>         ) &&
>         ! test -s actual.out &&
> @@ -232,7 +232,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
>                         cd submodule &&
>                         git config --unset fetch.recurseSubmodules
>                 ) &&
> -               git config --unset fetch.recurseSubmodules
> +               git config --unset fetch.recurseSubmodules &&
>                 git fetch >../actual.out 2>../actual.err
>         ) &&
>         ! test -s actual.out &&
> @@ -312,7 +312,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
>                 ) &&
>                 head1=$(git rev-parse --short HEAD^) &&
>                 git add subdir/deepsubmodule &&
> -               git commit -m "new deepsubmodule"
> +               git commit -m "new deepsubmodule" &&
>                 head2=$(git rev-parse --short HEAD) &&
>                 echo "Fetching submodule submodule" > ../expect.err.sub &&
>                 echo "From $pwd/submodule" >> ../expect.err.sub &&
> --
> 2.0.0.274.g6b2cd91
>