git-svn: extract base blob in generate_diff

[git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index 4a95035d85d7563b84df15a09dc7c8160e9864ca..1c39b593a628cc94d24d227cc5d92e00ac5e71ed 100755 (executable)
--- 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%/}"
 }
 
 #