From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Aug 2008 00:16:30 +0000 (-0700)
Subject: Merge branch 'ml/submodule'
X-Git-Tag: v1.6.1-rc1~295
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/8d13caf795902812d44809e2f222fb2334030603?hp=88ab18dfef55a41df2e1f69a8ab3e3ed9f915c31

Merge branch 'ml/submodule'

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

diff --git a/git-submodule.sh b/git-submodule.sh
index 4a95035d85..1c39b593a6 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -35,6 +35,7 @@ resolve_relative_url ()
 	remoteurl=$(git config "remote.$remote.url") ||
 		die "remote ($remote) does not have a url defined in .git/config"
 	url="$1"
+	remoteurl=${remoteurl%/}
 	while test -n "$url"
 	do
 		case "$url" in
@@ -49,7 +50,7 @@ resolve_relative_url ()
 			break;;
 		esac
 	done
-	echo "$remoteurl/$url"
+	echo "$remoteurl/${url%/}"
 }
 
 #