global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-16 19:50:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fg/submodule-git-file-git-dir' into next

Browse Source 
* fg/submodule-git-file-git-dir:
  submodule::module_clone(): silence die() message from module_name()
  submodule: whitespace fix
This commit is contained in:
Junio C Hamano
2011-10-23 21:51:32 -07:00
parent 7c9bf71696 9e76d4a834
commit c18af0367a
1 changed files with 4 additions and 4 deletions
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')
name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
test -z "$name" &&
die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
echo "$name"
test -z "$name" &&
die "$(eval_gettext "No submodule mapping found in .gitmodules for path '\$path'")"
echo "$name"
}
#
@@ -130,7 +130,7 @@ module_clone()
gitdir=
gitdir_base=
name=$(module_name "$path")
name=$(module_name "$path" 2>/dev/null)
base_path=$(dirname "$path")
gitdir=$(git rev-parse --git-dir)