undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5526: fix some broken && chains

Browse Source 
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heiko Voigt 2017-08-17 12:36:13 +02:00 committed by Junio C Hamano
parent 3d9c5b5c44
commit 2aac933c62
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t5526-fetch-submodules.sh
View File

@ -183,7 +183,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
add_upstream_commit && add_upstream_commit &&
( (
cd downstream && cd downstream &&
git config fetch.recurseSubmodules true git config fetch.recurseSubmodules true &&
git fetch >../actual.out 2>../actual.err git fetch >../actual.out 2>../actual.err
) && ) &&
test_must_be_empty actual.out && test_must_be_empty actual.out &&
@ -208,7 +208,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" '
add_upstream_commit && add_upstream_commit &&
( (
cd downstream && cd downstream &&
git config fetch.recurseSubmodules true git config fetch.recurseSubmodules true &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) && ) &&
! test -s actual.out && ! test -s actual.out &&
@ -222,7 +222,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in
cd submodule && cd submodule &&
git config --unset fetch.recurseSubmodules git config --unset fetch.recurseSubmodules
) && ) &&
git config --unset fetch.recurseSubmodules git config --unset fetch.recurseSubmodules &&
git fetch >../actual.out 2>../actual.err git fetch >../actual.out 2>../actual.err
) && ) &&
! test -s actual.out && ! test -s actual.out &&
@ -302,7 +302,7 @@ test_expect_success "Recursion picks up all submodules when necessary" '
) && ) &&
head1=$(git rev-parse --short HEAD^) && head1=$(git rev-parse --short HEAD^) &&
git add subdir/deepsubmodule && git add subdir/deepsubmodule &&
git commit -m "new deepsubmodule" git commit -m "new deepsubmodule" &&
head2=$(git rev-parse --short HEAD) && head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err.sub && echo "Fetching submodule submodule" > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub && echo "From $pwd/submodule" >> ../expect.err.sub &&