Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5526: fix some broken && chains
author
Heiko Voigt
<hvoigt@hvoigt.net>
Thu, 17 Aug 2017 10:36:13 +0000
(12:36 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 17 Aug 2017 21:31:53 +0000
(14:31 -0700)
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5526-fetch-submodules.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3d9c5b5
)
diff --git
a/t/t5526-fetch-submodules.sh
b/t/t5526-fetch-submodules.sh
index f3b0a8d30afcb472398bef8623a49ba6bac7dc24..2e490778726da487eb63c73d856f1807f15720c8 100755
(executable)
--- a/
t/t5526-fetch-submodules.sh
+++ b/
t/t5526-fetch-submodules.sh
@@
-183,7
+183,7
@@
test_expect_success "recurseSubmodules=true propagates into submodules" '
add_upstream_commit &&
(
cd downstream &&
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 &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
@@
-208,7
+208,7
@@
test_expect_success "--no-recurse-submodules overrides config setting" '
add_upstream_commit &&
(
cd downstream &&
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 &&
git fetch --no-recurse-submodules >../actual.out 2>../actual.err
) &&
! test -s actual.out &&
@@
-222,7
+222,7
@@
test_expect_success "Recursion doesn't happen when no new commits are fetched in
cd submodule &&
git config --unset fetch.recurseSubmodules
) &&
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 &&
git fetch >../actual.out 2>../actual.err
) &&
! test -s actual.out &&
@@
-302,7
+302,7
@@
test_expect_success "Recursion picks up all submodules when necessary" '
) &&
head1=$(git rev-parse --short HEAD^) &&
git add subdir/deepsubmodule &&
) &&
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 &&
head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub &&