submodule status: use submodule--helper is-active
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Mar 16, 2017 at 15:29 UTC
6dc9f01f33bdbaebcf811c89766d4e4902a96f27
1 file changed
+1
-2
git-submodule.sh
+1
-2
@@ -1010,14 +1010,13 @@ cmd_status()
1010
do
1011
die_if_unmatched "$mode" "$sha1"
1012
name=$(git submodule--helper name "$sm_path") || exit
1013
- url=$(git config submodule."$name".url)
1013
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
1014
if test "$stage" = U
1015
then
1016
say "U$sha1 $displaypath"
1017
continue
1018
fi
1020
- if test -z "$url" ||
1019
+ if ! git submodule--helper is-active "$sm_path" ||
1020
{
1021
! test -d "$sm_path"/.git &&
1022
! test -f "$sm_path"/.git