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

diff --git a/git-submodule.sh b/git-submodule.sh
index e4c31fb7dbc732b9e97a43ac3b58b818b35a02ef..46d75aba3114778f277cb62b5b0fe84866b326c9 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -35,7 +35,8 @@ 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"
+       remoteurl=${remoteurl%/}
        while test -n "$url"
        do
                case "$url" in
@@ -50,7 +51,7 @@ resolve_relative_url ()
                        break;;
                esac
        done
-       echo "$remoteurl/$url"
+       echo "$remoteurl/${url%/}"
 }
 
 #