]> git.ipfire.org Git - thirdparty/git.git/commitdiff
submodule status: use submodule--helper is-active
authorBrandon Williams <bmwill@google.com>
Thu, 16 Mar 2017 22:29:44 +0000 (15:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Mar 2017 18:06:09 +0000 (11:06 -0700)
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-submodule.sh

index 136e26a2c8d4ca1e835e2873f3fd994864dc135e..ab233712d26288cddeb056116fa9d48b88ce5c7b 100755 (executable)
@@ -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