diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:24 -0700 |
| commit | cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147 (patch) | |
| tree | 9274374873a1399dadd742d9355974e6ab8935b4 | |
| parent | Merge branch 'ks/branch-set-upstream' (diff) | |
| parent | t7406-submodule-update: fix broken &&-chains (diff) | |
| download | tgif-cc2beafc4bcdbb3fa4b9c9434704c4ba30e0f147.tar.xz | |
Merge branch 'sg/t7406-chain-fix'
Test fix.
* sg/t7406-chain-fix:
t7406-submodule-update: fix broken &&-chains
| -rwxr-xr-x | t/t7406-submodule-update.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 6f083c4d68..9e0d31700e 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 && |