Skip to content

Commit cc2beaf

Browse files
committed
Merge branch 'sg/t7406-chain-fix'
Test fix. * sg/t7406-chain-fix: t7406-submodule-update: fix broken &&-chains
2 parents 4229478 + 8de19d6 commit cc2beaf

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t7406-submodule-update.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ test_expect_success 'setup a submodule tree' '
6565
git commit -m "none"
6666
) &&
6767
git clone . recursivesuper &&
68-
( cd recursivesuper
68+
( cd recursivesuper &&
6969
git submodule add ../super super
7070
)
7171
'
@@ -245,13 +245,13 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
245245
(
246246
cd super &&
247247
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 &&
250250
test_cmp expect actual &&
251251
git checkout -b test-branch &&
252252
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 &&
255255
test_cmp expect actual &&
256256
git checkout master &&
257257
git branch -d test-branch &&
@@ -891,7 +891,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
891891
rm -rf submodule2 &&
892892
mkdir -p "moved/sub module" &&
893893
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" &&
895895
git commit -am "post move" &&
896896
git submodule update &&
897897
git status | sed "s/$H2/XXX/" >actual &&

0 commit comments

Comments
 (0)