submodule sync: use submodule--helper is-active

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

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