From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:16:32 +0000 (-0700)
Subject: Merge branch 'tc/submodule-clone-name-detection'
X-Git-Tag: v1.7.8-rc0~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0b26d1e8b29a4248d56078318fec6906e3007742;p=git.git

Merge branch 'tc/submodule-clone-name-detection'

* tc/submodule-clone-name-detection:
  submodule::module_clone(): silence die() message from module_name()
  submodule: whitespace fix
---

0b26d1e8b29a4248d56078318fec6906e3007742
diff --cc git-submodule.sh
index 928a62f62,5d29f8214..3adab9363
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@@ -122,15 -122,9 +122,15 @@@ module_clone(
  	path=$1
  	url=$2
  	reference="$3"
 +	quiet=
 +	if test -n "$GIT_QUIET"
 +	then
 +		quiet=-q
 +	fi
 +
  	gitdir=
  	gitdir_base=
- 	name=$(module_name "$path")
+ 	name=$(module_name "$path" 2>/dev/null)
  	base_path=$(dirname "$path")
  
  	gitdir=$(git rev-parse --git-dir)