[PATCH] git-submodule.sh - Remove trailing / from URL if found
- From
Mark Levedahl <mlevedahl@gmail.com>
- Date
- Aug 21, 2008, 01:07 UTC
- Message-ID
- <1219280847-872-1-git-send-email-mlevedahl@gmail.com>
- In-Reply-To
- <7vpro4tjkw.fsf@gitster.siamese.dyndns.org>
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. Trailing /'s are likely when cloning locally using tab-completion, so the slash may appear in either superproject or submodule URL. So, ignore the trailing slash if it already exists in the superproject's URL, and don't record one for the submodule (which could itself have submodules...).
Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> --- git-submodule.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index b40f876..e576cd2 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -36,6 +36,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 @@ -50,7 +51,7 @@ resolve_relative_url () break;; esac done - echo "$remoteurl/$url" + echo "$remoteurl"/"${url%/}" } #
-- 1.6.0.22.g2957