Commit 758615e2 authored by Jon Seymour's avatar Jon Seymour Committed by Junio C Hamano

submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar

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's avatarJon Seymour <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 967b2c66
......@@ -60,8 +60,12 @@ resolve_relative_url ()
*:*|/*)
is_relative=
;;
./*|../*)
is_relative=t
;;
*)
is_relative=t
remoteurl="./$remoteurl"
;;
esac
......@@ -79,7 +83,12 @@ resolve_relative_url ()
sep=:
;;
*)
die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
if test -z "$is_relative" || test "." = "$remoteurl"
then
die "$(eval_gettext "cannot strip one component off url '\$remoteurl'")"
else
remoteurl=.
fi
;;
esac
;;
......@@ -90,7 +99,8 @@ resolve_relative_url ()
break;;
esac
done
echo "${is_relative:+${up_path}}$remoteurl$sep${url%/}"
remoteurl="$remoteurl$sep${url%/}"
echo "${is_relative:+${up_path}}${remoteurl#./}"
}
#
......
......@@ -564,7 +564,7 @@ test_expect_success '../subrepo works with scp-style URL - [email protected]:path/to/rep
)
'
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 &&
......@@ -587,7 +587,7 @@ 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 &&
......@@ -598,7 +598,7 @@ test_expect_failure '../subrepo works with relative local path - ./foo' '
)
'
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 &&
......
......@@ -88,7 +88,7 @@ test_expect_success '"git submodule sync" should not vivify uninteresting submod
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form foo' '
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 &&
......@@ -110,7 +110,7 @@ test_expect_success '"git submodule sync" handles origin URL of the form foo/bar
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form ./foo' '
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 &&
......@@ -121,7 +121,7 @@ test_expect_failure '"git submodule sync" handles origin URL of the form ./foo'
)
'
test_expect_failure '"git submodule sync" handles origin URL of the form ./foo/bar' '
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 &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment