Re: [PATCH] submodule: Improve handling of relative submodule URLs.

Jacob Helwig· Feb 25, 2010, 19:28 UTC · lore

[PATCH] submodule: Improve handling of relative submodule URLs.

Relative URLs only worked with <proto>://<host>/<location> style URLs, and would break when cloning a repository using <user>@<host>:<location> (scp) style "URL"s.

When a submodule's URL was set to "../submodule.git", and the repository using it was cloned from "git@example.com:repo.git", git would try to clone the submodule from "git@example.com:repo.git/submodule.git", which would not likely work.

This updates resolve_relative_url to handle the scp style URLs.

Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
---
 git-submodule.sh |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Show changes to git-submodule.sh +5 −4

diff --git a/git-submodule.sh b/git-submodule.sh
index 664f217..97787a3 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -37,18 +37,19 @@ resolve_relative_url ()
 	while test -n "$url"
 	do
 		case "$url" in
-		../*)
+		..[/:]*)
 			url="${url#../}"
-			remoteurl="${remoteurl%/*}"
+			remoteurl="$(echo "$remoteurl" | sed -e 's|\(.*[/:]\).*|\1|')"
 			;;
-		./*)
+		.[/:]*)
 			url="${url#./}"
+			remoteurl="$remoteurl/"
 			;;
 		*)
 			break;;
 		esac
 	done
-	echo "$remoteurl/${url%/}"
+	echo "$remoteurl${url#[/:]}"
 }
 
 #

-- 
1.7.0.91.g310a

Mark Levedahl· Feb 26, 2010, 02:03 UTC · re: Jacob Helwig · lore

On 02/25/2010 02:28 PM, Jacob Helwig wrote:

Show 9 quoted lines

> Relative URLs only worked with<proto>://<host>/<location>  style URLs, and
> would break when cloning a repository using<user>@<host>:<location>  (scp)
> style "URL"s.
>
> When a submodule's URL was set to "../submodule.git", and the repository
> using it was cloned from "git@example.com:repo.git", git would try to
> clone the submodule from "git@example.com:repo.git/submodule.git", which
> would not likely work.
>

My solution for this has been to always give the full path, possibly using ~

e.g.,     git@example.com:~/repo.git

and as that works fine, I'm indifferent to this proposed change.

Mark

patchRe: [PATCH] submodule: Improve handling of relative submodule URLs.