diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
| commit | 45121b9e302bb8640482c2add01fb6cfb1681534 (patch) | |
| tree | a67d53fc4b319259d3a181a7b3669cd6447a6f54 /t | |
| parent | Merge branch 'as/grep-quiet-no-match-exit-code-fix' (diff) | |
| parent | t5526: fix some broken && chains (diff) | |
| download | tgif-45121b9e302bb8640482c2add01fb6cfb1681534.tar.xz | |
Merge branch 'hv/t5526-andand-chain-fix'
Test fix.
* hv/t5526-andand-chain-fix:
t5526: fix some broken && chains
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 162baf101f..42251f7f3a 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -193,7 +193,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" ' 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 +218,7 @@ test_expect_success "--no-recurse-submodules overrides config setting" ' 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 +232,7 @@ test_expect_success "Recursion doesn't happen when no new commits are fetched in 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 +312,7 @@ test_expect_success "Recursion picks up all submodules when necessary" ' ) && 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 && |