Add tests for submodule sync --recursive
Signed-off-by: Phil Hord <hordp@cisco.com> Acked-By: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
parent
82f49f294c
commit
44fa0ef58c
@ -17,18 +17,25 @@ test_expect_success setup '
|
||||
git commit -m upstream &&
|
||||
git clone . super &&
|
||||
git clone super submodule &&
|
||||
(cd submodule &&
|
||||
git submodule add ../submodule sub-submodule &&
|
||||
test_tick &&
|
||||
git commit -m "sub-submodule"
|
||||
) &&
|
||||
(cd super &&
|
||||
git submodule add ../submodule submodule &&
|
||||
test_tick &&
|
||||
git commit -m "submodule"
|
||||
) &&
|
||||
git clone super super-clone &&
|
||||
(cd super-clone && git submodule update --init) &&
|
||||
(cd super-clone && git submodule update --init --recursive) &&
|
||||
git clone super empty-clone &&
|
||||
(cd empty-clone && git submodule init) &&
|
||||
git clone super top-only-clone &&
|
||||
git clone super relative-clone &&
|
||||
(cd relative-clone && git submodule update --init)
|
||||
(cd relative-clone && git submodule update --init --recursive) &&
|
||||
git clone super recursive-clone &&
|
||||
(cd recursive-clone && git submodule update --init --recursive)
|
||||
'
|
||||
|
||||
test_expect_success 'change submodule' '
|
||||
@ -46,6 +53,11 @@ test_expect_success 'change submodule url' '
|
||||
git pull
|
||||
) &&
|
||||
mv submodule moved-submodule &&
|
||||
(cd moved-submodule &&
|
||||
git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
|
||||
test_tick &&
|
||||
git commit -a -m moved-sub-submodule
|
||||
) &&
|
||||
(cd super &&
|
||||
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
|
||||
test_tick &&
|
||||
@ -61,6 +73,9 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
|
||||
test -d "$(cd super-clone/submodule &&
|
||||
git config remote.origin.url
|
||||
)" &&
|
||||
test ! -d "$(cd super-clone/submodule/sub-submodule &&
|
||||
git config remote.origin.url
|
||||
)" &&
|
||||
(cd super-clone/submodule &&
|
||||
git checkout master &&
|
||||
git pull
|
||||
@ -70,6 +85,25 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '"git submodule sync --recursive" should update all submodule URLs' '
|
||||
(cd super-clone &&
|
||||
(cd submodule &&
|
||||
git pull --no-recurse-submodules
|
||||
) &&
|
||||
git submodule sync --recursive
|
||||
) &&
|
||||
test -d "$(cd super-clone/submodule &&
|
||||
git config remote.origin.url
|
||||
)" &&
|
||||
test -d "$(cd super-clone/submodule/sub-submodule &&
|
||||
git config remote.origin.url
|
||||
)" &&
|
||||
(cd super-clone/submodule/sub-submodule &&
|
||||
git checkout master &&
|
||||
git pull
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '"git submodule sync" should update known submodule URLs' '
|
||||
(cd empty-clone &&
|
||||
git pull &&
|
||||
@ -107,6 +141,23 @@ test_expect_success '"git submodule sync" handles origin URL of the form foo/bar
|
||||
#actual foo/submodule
|
||||
test "$(git config remote.origin.url)" = "../foo/submodule"
|
||||
)
|
||||
(cd submodule/sub-submodule &&
|
||||
test "$(git config remote.origin.url)" != "../../foo/submodule"
|
||||
)
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success '"git submodule sync --recursive" propagates changes in origin' '
|
||||
(cd recursive-clone &&
|
||||
git remote set-url origin foo/bar &&
|
||||
git submodule sync --recursive &&
|
||||
(cd submodule &&
|
||||
#actual foo/submodule
|
||||
test "$(git config remote.origin.url)" = "../foo/submodule"
|
||||
)
|
||||
(cd submodule/sub-submodule &&
|
||||
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
||||
)
|
||||
)
|
||||
'
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user