undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* tc/submodule-clone-name-detection:
  submodule::module_clone(): silence die() message from module_name()
  submodule: whitespace fix
This commit is contained in:
Junio C Hamano 2011-10-26 16:16:32 -07:00
commit 0b26d1e8b2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-submodule.sh
View File

@ -104,9 +104,9 @@ module_name()
re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g') re=$(printf '%s\n' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' ) sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
test -z "$name" && test -z "$name" &&
die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")" die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
echo "$name" echo "$name"
} }
# #
@ -130,7 +130,7 @@ module_clone()
gitdir= gitdir=
gitdir_base= gitdir_base=
name=$(module_name "$path") name=$(module_name "$path" 2>/dev/null)
base_path=$(dirname "$path") base_path=$(dirname "$path")
gitdir=$(git rev-parse --git-dir) gitdir=$(git rev-parse --git-dir)