mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: use the 'submodule--helper config' command

Browse Source 
Use the 'submodule--helper config' command in git-submodules.sh to avoid
referring explicitly to .gitmodules by the hardcoded file path.

This makes it possible to access the submodules configuration in a more
controlled way.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Antonio Ospite
2018-10-05 15:05:57 +02:00
committed by Junio C Hamano
parent 2502ffc0cf
commit b2faad44e2
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

@ -72,7 +72,7 @@ get_submodule_config () {
value=$(git config submodule."$name"."$option") value=$(git config submodule."$name"."$option")
if test -z "$value" if test -z "$value"
then then
value=$(git config -f .gitmodules submodule."$name"."$option") value=$(git submodule--helper config submodule."$name"."$option")
fi fi
printf '%s' "${value:-$default}" printf '%s' "${value:-$default}"
} }
@ -283,11 +283,11 @@ or you are unsure what this means choose another name with the '--name' option."
git add --no-warn-embedded-repo $force "$sm_path" || git add --no-warn-embedded-repo $force "$sm_path" ||
die "$(eval_gettext "Failed to add submodule '\$sm_path'")" die "$(eval_gettext "Failed to add submodule '\$sm_path'")"
git config -f .gitmodules submodule."$sm_name".path "$sm_path" && git submodule--helper config submodule."$sm_name".path "$sm_path" &&
git config -f .gitmodules submodule."$sm_name".url "$repo" && git submodule--helper config submodule."$sm_name".url "$repo" &&
if test -n "$branch" if test -n "$branch"
then then
git config -f .gitmodules submodule."$sm_name".branch "$branch" git submodule--helper config submodule."$sm_name".branch "$branch"
fi && fi &&
git add --force .gitmodules || git add --force .gitmodules ||
die "$(eval_gettext "Failed to register submodule '\$sm_path'")" die "$(eval_gettext "Failed to register submodule '\$sm_path'")"