mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/submodule-relative-scp-url'

Browse Source 
* tr/submodule-relative-scp-url:
  submodule: fix relative url parsing for scp-style origin
This commit is contained in:
Junio C Hamano
2011-01-13 11:34:39 -08:00
parent 3e70e37e72 ea640cc691
commit 4f93fc745a
2 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
t/t7400-submodule-basic.sh
View File

@ -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