summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 18:23:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 18:23:24 (GMT)
commitcc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147 (patch)
tree9274374873a1399dadd742d9355974e6ab8935b4
parent4229478639c1c03a763ead3e30645b05f5e93ea1 (diff)
parent8de19d6be83651b1da4f38ff8649fbe8f28831b8 (diff)
downloadgit-cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147.zip
git-cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147.tar.gz
git-cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147.tar.bz2
Merge branch 'sg/t7406-chain-fix'
Test fix. * sg/t7406-chain-fix: t7406-submodule-update: fix broken &&-chains
-rwxr-xr-xt/t7406-submodule-update.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 6f083c4..9e0d317 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -65,7 +65,7 @@ test_expect_success 'setup a submodule tree' '
git commit -m "none"
) &&
git clone . recursivesuper &&
- ( cd recursivesuper
+ ( cd recursivesuper &&
git submodule add ../super super
)
'
@@ -245,13 +245,13 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
(
cd super &&
git submodule update --remote --force submodule &&
- git -C submodule log -1 --oneline >actual
- git -C ../submodule log -1 --oneline master >expect
+ git -C submodule log -1 --oneline >actual &&
+ git -C ../submodule log -1 --oneline master >expect &&
test_cmp expect actual &&
git checkout -b test-branch &&
git submodule update --remote --force submodule &&
- git -C submodule log -1 --oneline >actual
- git -C ../submodule log -1 --oneline test-branch >expect
+ git -C submodule log -1 --oneline >actual &&
+ git -C ../submodule log -1 --oneline test-branch >expect &&
test_cmp expect actual &&
git checkout master &&
git branch -d test-branch &&
@@ -891,7 +891,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
rm -rf submodule2 &&
mkdir -p "moved/sub module" &&
git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
- git config -f .gitmodules submodule.submodule2.path "moved/sub module"
+ git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
git commit -am "post move" &&
git submodule update &&
git status | sed "s/$H2/XXX/" >actual &&