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

submodule status: 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 136e26a2c8..ab233712d2 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -1010,14 +1010,13 @@ cmd_status()
 	do
 		die_if_unmatched "$mode" "$sha1"
 		name=$(git submodule--helper name "$sm_path") || exit
-		url=$(git config submodule."$name".url)
 		displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
 		if test "$stage" = U
 		then
 			say "U$sha1 $displaypath"
 			continue
 		fi
-		if test -z "$url" ||
+		if ! git submodule--helper is-active "$sm_path" ||
 		{
 			! test -d "$sm_path"/.git &&
 			! test -f "$sm_path"/.git