зеркало из https://github.com/microsoft/git.git
Merge branch 'tr/submodule-relative-scp-url' into maint
* tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin
This commit is contained in:
Коммит
8a59702ad8
|
@ -37,12 +37,24 @@ resolve_relative_url ()
|
|||
die "remote ($remote) does not have a url defined in .git/config"
|
||||
url="$1"
|
||||
remoteurl=${remoteurl%/}
|
||||
sep=/
|
||||
while test -n "$url"
|
||||
do
|
||||
case "$url" in
|
||||
../*)
|
||||
url="${url#../}"
|
||||
remoteurl="${remoteurl%/*}"
|
||||
case "$remoteurl" in
|
||||
*/*)
|
||||
remoteurl="${remoteurl%/*}"
|
||||
;;
|
||||
*:*)
|
||||
remoteurl="${remoteurl%:*}"
|
||||
sep=:
|
||||
;;
|
||||
*)
|
||||
die "cannot strip one component off url '$remoteurl'"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
./*)
|
||||
url="${url#./}"
|
||||
|
@ -51,7 +63,7 @@ resolve_relative_url ()
|
|||
break;;
|
||||
esac
|
||||
done
|
||||
echo "$remoteurl/${url%/}"
|
||||
echo "$remoteurl$sep${url%/}"
|
||||
}
|
||||
|
||||
#
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче