mirror of
https://github.com/git/git.git
synced 2024-06-19 15:59:37 +02:00
758615e251
Currently git submodule init and git submodule sync fail with an error if the superproject origin URL is of the form foo but succeed if the superproject origin URL is of the form ./foo or ./foo/bar or foo/bar. This change makes handling of the foo case behave like the handling of the ./foo case and also ensures that superfluous leading and embedded ./'s are removed from the resulting derived URLs. Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
178 lines
4.2 KiB
Bash
Executable File
178 lines
4.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 David Aguilar
|
|
#
|
|
|
|
test_description='git submodule sync
|
|
|
|
These tests exercise the "git submodule sync" subcommand.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo file > file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m upstream &&
|
|
git clone . super &&
|
|
git clone super 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) &&
|
|
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)
|
|
'
|
|
|
|
test_expect_success 'change submodule' '
|
|
(cd submodule &&
|
|
echo second line >> file &&
|
|
test_tick &&
|
|
git commit -a -m "change submodule"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'change submodule url' '
|
|
(cd super &&
|
|
cd submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
) &&
|
|
mv submodule moved-submodule &&
|
|
(cd super &&
|
|
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
|
|
test_tick &&
|
|
git commit -a -m moved-submodule
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs' '
|
|
(cd super-clone &&
|
|
git pull --no-recurse-submodules &&
|
|
git submodule sync
|
|
) &&
|
|
test -d "$(cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(cd super-clone/submodule &&
|
|
git checkout master &&
|
|
git pull
|
|
) &&
|
|
(cd super-clone &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update known submodule URLs' '
|
|
(cd empty-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
|
|
(cd top-only-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -z "$(git config submodule.submodule.url)" &&
|
|
git submodule sync submodule &&
|
|
test -z "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin foo &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual fails with: "cannot strip off url foo
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin foo/bar &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin ./foo &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual ./submodule
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin ./foo/bar &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual ./foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin ../foo &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual ../submodule
|
|
test "$(git config remote.origin.url)" = "../../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
git submodule sync &&
|
|
(cd submodule &&
|
|
#actual ../foo/submodule
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' '
|
|
(cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
mkdir -p a/b/c &&
|
|
( cd a/b/c &&
|
|
git init &&
|
|
:> .gitignore &&
|
|
git add .gitignore &&
|
|
test_tick &&
|
|
git commit -m "initial commit" ) &&
|
|
git submodule add ../bar/a/b/c ./a/b/c &&
|
|
git submodule sync &&
|
|
(cd a/b/c &&
|
|
#actual ../foo/bar/a/b/c
|
|
test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
|
|
)
|
|
)
|
|
'
|
|
|
|
|
|
test_done
|