From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Sep 2017 08:03:05 +0000 (+0900)
Subject: Merge branch 'hv/t5526-andand-chain-fix' into maint
X-Git-Tag: v2.14.2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b3c2280960083d973ac02032255c8ab7ed59e930?ds=inline;hp=-c

Merge branch 'hv/t5526-andand-chain-fix' into maint

Test fix.

* hv/t5526-andand-chain-fix:
t5526: fix some broken && chains
---

b3c2280960083d973ac02032255c8ab7ed59e930
diff --combined t/t5526-fetch-submodules.sh
index 162baf101f,2e49077872..42251f7f3a
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@@ -71,16 -71,6 +71,16 @@@ test_expect_success "fetch --recurse-su
  	test_i18ncmp expect.err actual.err
  '
  
 +test_expect_success "submodule.recurse option triggers recursive fetch" '
 +	add_upstream_commit &&
 +	(
 +		cd downstream &&
 +		git -c submodule.recurse fetch >../actual.out 2>../actual.err
 +	) &&
 +	test_must_be_empty actual.out &&
 +	test_i18ncmp expect.err actual.err
 +'
 +
  test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
  	add_upstream_commit &&
  	(
@@@ -193,7 -183,7 +193,7 @@@ test_expect_success "recurseSubmodules=
  	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 -208,7 +218,7 @@@ test_expect_success "--no-recurse-submo
  	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 -222,7 +232,7 @@@ test_expect_success "Recursion doesn't 
  			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 -302,7 +312,7 @@@ test_expect_success "Recursion picks u
  		) &&
  		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 &&