diff options
| author |  Imran M Yousuf <imyousuf@smartitengineering.com> | 2008-05-15 13:42:58 +0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-05-16 12:38:52 -0700 |
| commit | a5099bb4178591d9a16d704c74dba34b92f35861 (patch) | |
| tree | c1a5ea6f397bba67d0fb6e802c43fd669ca68dd2 | |
| parent | Merge git://repo.or.cz/git-gui (diff) | |
| download | tgif-a5099bb4178591d9a16d704c74dba34b92f35861.tar.xz | |
Use '-f' option to point to the .gitmodules file
'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>
| -rwxr-xr-x | git-submodule.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 67f7a28cb3..b4b7d28d9d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -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'" @@ -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'" } @@ -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" |