Skip to content

Commit

Permalink
Use '-f' option to point to the .gitmodules file
Browse files Browse the repository at this point in the history
'git config' has a '-f' option that takes the file to parse.
Using it rather than the environment variable seems more logical
and simplified.

Signed-off-by: Imran M Yousuf <imyousuf@smartitengineering.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Imran M Yousuf authored and Junio C Hamano committed May 16, 2008
1 parent 1fbb58b commit a5099bb
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions git-submodule.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ module_name()
{
# Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
re=$(printf '%s' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
name=$( GIT_CONFIG=.gitmodules \
git config --get-regexp '^submodule\..*\.path$' |
name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
test -z "$name" &&
die "No submodule mapping found in .gitmodules for path '$path'"
Expand Down Expand Up @@ -198,8 +197,8 @@ cmd_add()
git add "$path" ||
die "Failed to add submodule '$path'"

GIT_CONFIG=.gitmodules git config submodule."$path".path "$path" &&
GIT_CONFIG=.gitmodules git config submodule."$path".url "$repo" &&
git config -f .gitmodules submodule."$path".path "$path" &&
git config -f .gitmodules submodule."$path".url "$repo" &&
git add .gitmodules ||
die "Failed to register submodule '$path'"
}
Expand Down Expand Up @@ -240,7 +239,7 @@ cmd_init()
url=$(git config submodule."$name".url)
test -z "$url" || continue

url=$(GIT_CONFIG=.gitmodules git config submodule."$name".url)
url=$(git config -f .gitmodules submodule."$name".url)
test -z "$url" &&
die "No url found for submodule path '$path' in .gitmodules"

Expand Down

0 comments on commit a5099bb

Please sign in to comment.