t7406-submodule-update: fix broken &&-chains
Three tests in 't7406-submodule-update' contain broken &&-chains, but since they are all in subshells, chain-lint couldn't notice them. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Jun 16, 2018 at 22:33 UTC
8de19d6be83651b1da4f38ff8649fbe8f28831b8
1 file changed
+6
-6
t/t7406-submodule-update.sh
+6
-6
@@ -65,7 +65,7 @@ test_expect_success 'setup a submodule tree' '
65
git commit -m "none"
66
) &&
67
git clone . recursivesuper &&
68
- ( cd recursivesuper
68
+ ( cd recursivesuper &&
69
git submodule add ../super super
70
)
71
'
@@ -245,13 +245,13 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
245
(
246
cd super &&
247
git submodule update --remote --force submodule &&
248
- git -C submodule log -1 --oneline >actual
249
- git -C ../submodule log -1 --oneline master >expect
248
+ git -C submodule log -1 --oneline >actual &&
249
+ git -C ../submodule log -1 --oneline master >expect &&
250
test_cmp expect actual &&
251
git checkout -b test-branch &&
252
git submodule update --remote --force submodule &&
253
- git -C submodule log -1 --oneline >actual
254
- git -C ../submodule log -1 --oneline test-branch >expect
253
+ git -C submodule log -1 --oneline >actual &&
254
+ git -C ../submodule log -1 --oneline test-branch >expect &&
255
test_cmp expect actual &&
256
git checkout master &&
257
git branch -d test-branch &&
@@ -891,7 +891,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
891
rm -rf submodule2 &&
892
mkdir -p "moved/sub module" &&
893
git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
894
- git config -f .gitmodules submodule.submodule2.path "moved/sub module"
894
+ git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
895
git commit -am "post move" &&
896
git submodule update &&
897
git status | sed "s/$H2/XXX/" >actual &&