Skip to content

Commit b3c2280

Browse files
committed
Merge branch 'hv/t5526-andand-chain-fix' into maint
Test fix. * hv/t5526-andand-chain-fix: t5526: fix some broken && chains
2 parents f04f860 + 2aac933 commit b3c2280

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t5526-fetch-submodules.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
193193
add_upstream_commit &&
194194
(
195195
cd downstream &&
196-
git config fetch.recurseSubmodules true
196+
git config fetch.recurseSubmodules true &&
197197
git fetch >../actual.out 2>../actual.err
198198
) &&
199199
test_must_be_empty actual.out &&
@@ -218,7 +218,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
218218
add_upstream_commit &&
219219
(
220220
cd downstream &&
221-
git config fetch.recurseSubmodules true
221+
git config fetch.recurseSubmodules true &&
222222
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
223223
) &&
224224
! test -s actual.out &&
@@ -232,7 +232,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
232232
cd submodule &&
233233
git config --unset fetch.recurseSubmodules
234234
) &&
235-
git config --unset fetch.recurseSubmodules
235+
git config --unset fetch.recurseSubmodules &&
236236
git fetch >../actual.out 2>../actual.err
237237
) &&
238238
! test -s actual.out &&
@@ -312,7 +312,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
312312
) &&
313313
head1=$(git rev-parse --short HEAD^) &&
314314
git add subdir/deepsubmodule &&
315-
git commit -m "new deepsubmodule"
315+
git commit -m "new deepsubmodule" &&
316316
head2=$(git rev-parse --short HEAD) &&
317317
echo "Fetching submodule submodule" > ../expect.err.sub &&
318318
echo "From $pwd/submodule" >> ../expect.err.sub &&

0 commit comments

Comments
 (0)