development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Test fix.

* hv/t5526-andand-chain-fix:
  t5526: fix some broken && chains
This commit is contained in:
Junio C Hamano 2017-08-23 14:13:13 -07:00
parent 85c81a74e2 2aac933c62
commit 45121b9e30
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

@ -193,7 +193,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 &&
@ -218,7 +218,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 &&
@ -232,7 +232,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 &&
@ -312,7 +312,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 &&