diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-13 19:34:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-13 19:34:39 (GMT) |
| commit | 4f93fc745ab4f51339ffb3b0e49a5f28a4c2a337 (patch) | |
| tree | 92043345eeba362ecd1356a94067ec80d614021a /t | |
| parent | 3e70e37e72207e780ca1c6e86bbc3c2963e6038c (diff) | |
| parent | ea640cc691d56f7151c5ba654b09c4a987dbef93 (diff) | |
| download | git-4f93fc745ab4f51339ffb3b0e49a5f28a4c2a337.zip git-4f93fc745ab4f51339ffb3b0e49a5f28a4c2a337.tar.gz git-4f93fc745ab4f51339ffb3b0e49a5f28a4c2a337.tar.bz2 | |
Merge branch 'tr/submodule-relative-scp-url'
* tr/submodule-relative-scp-url:
submodule: fix relative url parsing for scp-style origin
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 2c49db9..874279e 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -446,4 +446,42 @@ test_expect_success 'add should fail when path is used by an existing directory' ) ' +test_expect_success 'set up for relative path tests' ' + mkdir reltest && + ( + cd reltest && + git init && + mkdir sub && + ( + cd sub && + git init && + test_commit foo + ) && + git add sub && + git config -f .gitmodules submodule.sub.path sub && + git config -f .gitmodules submodule.sub.url ../subrepo && + cp .git/config pristine-.git-config + ) +' + +test_expect_success 'relative path works with URL' ' + ( + cd reltest && + cp pristine-.git-config .git/config && + git config remote.origin.url ssh://hostname/repo && + git submodule init && + test "$(git config submodule.sub.url)" = ssh://hostname/subrepo + ) +' + +test_expect_success 'relative path works with user@host:path' ' + ( + cd reltest && + cp pristine-.git-config .git/config && + git config remote.origin.url user@host:repo && + git submodule init && + test "$(git config submodule.sub.url)" = user@host:subrepo + ) +' + test_done |