From: Mark Levedahl <mlevedahl@gmail.com>
Date: Wed, 20 Aug 2008 02:18:23 +0000 (-0400)
Subject: git-submodule.sh - Remove trailing / from URL if found
X-Git-Tag: v1.6.1-rc1~295^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7c695619868d0b867c87b0bb83303e058e010ac5;p=git.git

git-submodule.sh - Remove trailing / from URL if found

git clone does not complain if a trailing '/' is included in the origin
URL, but doing so causes resolution of a submodule's URL relative to the
superproject to fail. Regardless of whether git is changed to remove the
trailing / before recording the URL, we should avoid this issue in
submodule as existing repositories can have this problem.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-submodule.sh b/git-submodule.sh
index b40f876a2..e4c31fb7d 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -35,7 +35,7 @@ resolve_relative_url ()
 	remote="${remote:-origin}"
 	remoteurl=$(git config "remote.$remote.url") ||
 		die "remote ($remote) does not have a url defined in .git/config"
-	url="$1"
+	url="${1%/}"
 	while test -n "$url"
 	do
 		case "$url" in