Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'tc/submodule-clone-name-detection'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:16:32 +0000
(16:16 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 26 Oct 2011 23:16:32 +0000
(16:16 -0700)
* tc/submodule-clone-name-detection:
submodule::module_clone(): silence die() message from module_name()
submodule: whitespace fix
1
2
git-submodule.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
208a1cc
9e76d4a
)
diff --cc
git-submodule.sh
index 928a62f626fe7ff1db8239713d94ff9aa25158eb,5d29f8214950e2aa0f8cf8667302945079d9342a..3adab9363563e80e4ceb2c7fb5c3ab91ac1ef505
---
1
/
git-submodule.sh
---
2
/
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)