From: Brandon Williams <bmwill@google.com>
Date: Thu, 16 Mar 2017 22:29:46 +0000 (-0700)
Subject: submodule sync: use submodule--helper is-active
X-Git-Tag: v2.13.0-rc0~47^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25b31f1b73331d3d9e90a72c34e514795e98c174;p=thirdparty%2Fgit.git

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 577136148f..db94dea3b0 100755
--- 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