Currently the superproject origin URL is progressively transformed
by stepping through parts of the submodule URL and removing parts
from the superproject URL for each leading ../ found in the
submodule URL. No attempt is made to check that the edited URL still
has a path part left to remove. This can result in the construction
of an absolute submodule URL where the hostname part of the URL
has been replaced by path components of the submodule URL.
For example: if the origin URL is ssh://hostname/repo and the
submodule URL is ../../subrepo, then the origin URL of the subrepo
will be calculated as ssh://subrepo.
With this change, editing is only performed on the path part
of the superproject origin URL. Any attempt by to consume the
non-path parts of the origin URL results in a failure.
As a side effect of preserving correct handling of support for
URLs of the form user@host:repo, this change also fixes handling,
by submodule init, of origin super project URLs of the form:
foo, foo/bar, ./foo and ./foo/bar.
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
git-submodule.sh | 41 ++++++++++++++++++++++++++++++++---------
t/t7400-submodule-basic.sh | 23 ++++++++---------------
2 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index dbbc905..2550681 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -37,23 +37,42 @@ resolve_relative_url ()
remoteurl=$(git config "remote.$remote.url") ||
remoteurl=$(pwd) # the repository is its own authoritative upstream
url="$1"
- remoteurl=${remoteurl%/}
- sep=/
+ remoteurl="${remoteurl%/}"
+
+ case "$remoteurl" in
+ *//*/*)
+ variant="${remoteurl#*//*/}"
+ ;;
+ *::*)
+ variant="${remoteurl#*::}"
+ ;;
+ *:*)
+ variant="${remoteurl#*:}"
+ ;;
+ /*)
+ variant="${remoteurl#/}"
+ ;;
+ *)
+ variant="${remoteurl}"
+ ;;
+ esac
+ invariant="${remoteurl%$variant}"
+
while test -n "$url"
do
case "$url" in
../*)
url="${url#../}"
- case "$remoteurl" in
+ case "$variant" in
*/*)
- remoteurl="${remoteurl%/*}"
+ variant="${variant%/*}"
;;
- *:*)
- remoteurl="${remoteurl%:*}"
- sep=:
+ .)
+ die "$(eval_gettext "cannot strip one component off url '\${invariant}'")"
;;
*)
- die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
+ # add a sentinel when .. matchs foo
+ variant=.
;;
esac
;;
@@ -64,7 +83,11 @@ resolve_relative_url ()
break;;
esac
done
- echo "$remoteurl$sep${url%/}"
+ # ensure a trailing path separator
+ variant="${variant}/"
+ # strip the sentinel, if present
+ variant="${variant#./}"
+ echo "$invariant$variant${url%/}"
}
#
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 2674088..a94c5e9 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -576,7 +576,7 @@ test_expect_success '../subrepo works with helper URL- helper:://hostname/repo'
)
'
-test_expect_failure '../../subrepo fails with URL - ssh://hostname/repo' "
+test_expect_success '../../subrepo fails with URL - ssh://hostname/repo' "
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -585,12 +585,11 @@ test_expect_failure '../../subrepo fails with URL - ssh://hostname/repo' "
git config -f .gitmodules submodule.sub.url ../../subrepo &&
echo cannot strip one component off url \'ssh://hostname/\' > expected &&
test_must_fail git submodule init 2>actual &&
- #actual no failure, url configured as ssh://subrepo
test_cmp expected actual
)
"
-test_expect_failure '../../subrepo fails with absolute local path - /repo' "
+test_expect_success '../../subrepo fails with absolute local path - /repo' "
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -603,7 +602,7 @@ test_expect_failure '../../subrepo fails with absolute local path - /repo' "
)
"
-test_expect_failure '../../../subrepo fails with URL - ssh://hostname/repo' "
+test_expect_success '../../../subrepo fails with URL - ssh://hostname/repo' "
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -612,12 +611,11 @@ test_expect_failure '../../../subrepo fails with URL - ssh://hostname/repo' "
git config -f .gitmodules submodule.sub.url ../../../subrepo &&
echo cannot strip one component off url \'ssh://hostname/\' > expected &&
test_must_fail git submodule init 2>actual &&
- #actual no failure, url configured as ssh:/subrepo
test_cmp expected actual
)
"
-test_expect_failure '../../../../subrepo fails with with URL - ssh://hostname/repo' "
+test_expect_success '../../../../subrepo fails with with URL - ssh://hostname/repo' "
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -626,12 +624,11 @@ test_expect_failure '../../../../subrepo fails with with URL - ssh://hostname/re
git config -f .gitmodules submodule.sub.url ../../../../subrepo &&
echo cannot strip one component off url \'ssh://hostname/\' > expected &&
test_must_fail git submodule init 2>actual &&
- #actual no failure, url configured as ssh:/subrepo
test_cmp expected actual
)
"
-test_expect_failure '../../../../../subrepo fails with URL - ssh://hostname/repo' "
+test_expect_success '../../../../../subrepo fails with URL - ssh://hostname/repo' "
(
cd reltest &&
cp pristine-.git-config .git/config &&
@@ -640,7 +637,6 @@ test_expect_failure '../../../../../subrepo fails with URL - ssh://hostname/repo
git config -f .gitmodules submodule.sub.url ../../../../../subrepo &&
echo cannot strip one component off url \'ssh://hostname/\' > expected &&
test_must_fail git submodule init 2>actual &&
- #actual cannot strip one component off url 'ssh'
test_cmp expected actual
)
"
@@ -711,13 +707,12 @@ test_expect_failure 'relative path works with user@host:path/to/detour/../repo'
)
'
-test_expect_failure '../subrepo works with relative local path - foo' '
+test_expect_success '../subrepo works with relative local path - foo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
git config remote.origin.url foo &&
- # actual: fails with an error
git submodule init &&
test "$(git config submodule.sub.url)" = subrepo
)
@@ -734,26 +729,24 @@ test_expect_success '../subrepo works with relative local path - foo/bar' '
)
'
-test_expect_failure '../subrepo works with relative local path - ./foo' '
+test_expect_success '../subrepo works with relative local path - ./foo' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
git config remote.origin.url ./foo &&
git submodule init &&
- #actual ./subrepo
test "$(git config submodule.sub.url)" = subrepo
)
'
-test_expect_failure '../subrepo works with relative local path - ./foo/bar' '
+test_expect_success '../subrepo works with relative local path - ./foo/bar' '
(
cd reltest &&
cp pristine-.git-config .git/config &&
cp pristine-.gitmodules .gitmodules &&
git config remote.origin.url ./foo/bar &&
git submodule init &&
- #actual: ./foo/subrepo
test "$(git config submodule.sub.url)" = foo/subrepo
)
'
--
1.7.10.2.656.gb5a46db
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html