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: http://git.tremily.us/?a=commitdiff_plain;h=8d13caf795902812d44809e2f222fb2334030603;p=git.git

Merge branch 'ml/submodule'

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

8d13caf795902812d44809e2f222fb2334030603
diff --cc git-submodule.sh
index 4a95035d8,46d75aba3..1c39b593a
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -49,18 -51,9 +50,18 @@@ resolve_relative_url (
  			break;;
  		esac
  	done
- 	echo "$remoteurl/$url"
+ 	echo "$remoteurl/${url%/}"
  }
  
 +#
 +# Get submodule info for registered submodules
 +# $@ = path to limit submodule list
 +#
 +module_list()
 +{
 +	git ls-files --stage -- "$@" | grep '^160000 '
 +}
 +
  #
  # Map submodule path to submodule name
  #