* [PATCH] t5526: fix some broken && chains
@ 2017-08-17 10:36 Heiko Voigt
2017-08-17 17:44 ` Stefan Beller
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Voigt @ 2017-08-17 10:36 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t5526: fix some broken && chains
2017-08-17 10:36 [PATCH] t5526: fix some broken && chains Heiko Voigt
@ 2017-08-17 17:44 ` Stefan Beller
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Beller @ 2017-08-17 17:44 UTC (permalink / raw)
To: Heiko Voigt; +Cc: Junio C Hamano, git@vger.kernel.org
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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-17 17:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-17 10:36 [PATCH] t5526: fix some broken && chains Heiko Voigt
2017-08-17 17:44 ` Stefan Beller
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).