development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sg/t7406-chain-fix'

Browse source 
Test fix.

* sg/t7406-chain-fix:
  t7406-submodule-update: fix broken &&-chains
This commit is contained in:
Junio C Hamano 2018-06-18 11:23:23 -07:00
parent 4229478639 8de19d6be8
commit cc2beafc4b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
t/t7406-submodule-update.sh
View file

@ -65,7 +65,7 @@ test_expect_success 'setup a submodule tree' '
git commit -m "none" git commit -m "none"
) && ) &&
git clone . recursivesuper && git clone . recursivesuper &&
( cd recursivesuper ( cd recursivesuper &&
git submodule add ../super super git submodule add ../super super
) )
' '
@ -245,13 +245,13 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
( (
cd super && cd super &&
git submodule update --remote --force submodule && git submodule update --remote --force submodule &&
git -C submodule log -1 --oneline >actual git -C submodule log -1 --oneline >actual &&
git -C ../submodule log -1 --oneline master >expect git -C ../submodule log -1 --oneline master >expect &&
test_cmp expect actual && test_cmp expect actual &&
git checkout -b test-branch && git checkout -b test-branch &&
git submodule update --remote --force submodule && git submodule update --remote --force submodule &&
git -C submodule log -1 --oneline >actual git -C submodule log -1 --oneline >actual &&
git -C ../submodule log -1 --oneline test-branch >expect git -C ../submodule log -1 --oneline test-branch >expect &&
test_cmp expect actual && test_cmp expect actual &&
git checkout master && git checkout master &&
git branch -d test-branch && git branch -d test-branch &&
@ -891,7 +891,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '
rm -rf submodule2 && rm -rf submodule2 &&
mkdir -p "moved/sub module" && mkdir -p "moved/sub module" &&
git update-index --add --cacheinfo 160000 $H "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 commit -am "post move" &&
git submodule update && git submodule update &&
git status | sed "s/$H2/XXX/" >actual && git status | sed "s/$H2/XXX/" >actual &&