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

submodule sync: use submodule--helper is-active

Browse Source 
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-03-16 15:29:46 -07:00
committed by Junio C Hamano
parent e7849a9677
commit 25b31f1b73
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-submodule.sh
View File

@ -1089,14 +1089,14 @@ cmd_sync()
while read mode sha1 stage sm_path while read mode sha1 stage sm_path
do do
die_if_unmatched "$mode" "$sha1" die_if_unmatched "$mode" "$sha1"
name=$(git submodule--helper name "$sm_path")
# skip inactive submodules # skip inactive submodules
if ! git config "submodule.$name.url" >/dev/null 2>/dev/null if ! git submodule--helper is-active "$sm_path"
then then
continue continue
fi fi
name=$(git submodule--helper name "$sm_path")
url=$(git config -f .gitmodules --get submodule."$name".url) url=$(git config -f .gitmodules --get submodule."$name".url)
# Possibly a url relative to parent # Possibly a url relative to parent