From: Stefan Beller <sbeller@google.com>
To: Heiko Voigt <hvoigt@hvoigt.net>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] t5526: fix some broken && chains
Date: Thu, 17 Aug 2017 10:44:01 -0700 [thread overview]
Message-ID: <CAGZ79kY2xc+-63m7upVLrEkHLVgL3hGtTKOKnJPjgReCO_Aj2g@mail.gmail.com> (raw)
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
> ---
> 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
>
prev parent reply other threads:[~2017-08-17 17:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-17 10:36 [PATCH] t5526: fix some broken && chains Heiko Voigt
2017-08-17 17:44 ` Stefan Beller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kY2xc+-63m7upVLrEkHLVgL3hGtTKOKnJPjgReCO_Aj2g@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hvoigt@hvoigt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).