t5526: fix some broken && chains
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Heiko Voigt committed
Aug 17, 2017 at 12:36 UTC
2aac933c624c1a28b48eea0fd138117e1b9bc8c6
1 file changed
+4
-4
t/t5526-fetch-submodules.sh
+4
-4
@@ -183,7 +183,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
183
add_upstream_commit &&
184
(
185
cd downstream &&
186
- git config fetch.recurseSubmodules true
186
+ git config fetch.recurseSubmodules true &&
187
git fetch >../actual.out 2>../actual.err
188
) &&
189
test_must_be_empty actual.out &&
@@ -208,7 +208,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
208
add_upstream_commit &&
209
(
210
cd downstream &&
211
- git config fetch.recurseSubmodules true
211
+ git config fetch.recurseSubmodules true &&
212
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
213
) &&
214
! test -s actual.out &&
@@ -222,7 +222,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
222
cd submodule &&
223
git config --unset fetch.recurseSubmodules
224
) &&
225
- git config --unset fetch.recurseSubmodules
225
+ git config --unset fetch.recurseSubmodules &&
226
git fetch >../actual.out 2>../actual.err
227
) &&
228
! test -s actual.out &&
@@ -302,7 +302,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
302
) &&
303
head1=$(git rev-parse --short HEAD^) &&
304
git add subdir/deepsubmodule &&
305
- git commit -m "new deepsubmodule"
305
+ git commit -m "new deepsubmodule" &&
306
head2=$(git rev-parse --short HEAD) &&
307
echo "Fetching submodule submodule" > ../expect.err.sub &&
308
echo "From $pwd/submodule" >> ../expect.err.sub &&