зеркало из https://github.com/microsoft/git.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>
This commit is contained in:
Родитель
5c2bd8b77a
Коммит
6dc9f01f33
|
@ -1010,14 +1010,13 @@ cmd_status()
|
||||||
do
|
do
|
||||||
die_if_unmatched "$mode" "$sha1"
|
die_if_unmatched "$mode" "$sha1"
|
||||||
name=$(git submodule--helper name "$sm_path") || exit
|
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")
|
displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
|
||||||
if test "$stage" = U
|
if test "$stage" = U
|
||||||
then
|
then
|
||||||
say "U$sha1 $displaypath"
|
say "U$sha1 $displaypath"
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if test -z "$url" ||
|
if ! git submodule--helper is-active "$sm_path" ||
|
||||||
{
|
{
|
||||||
! test -d "$sm_path"/.git &&
|
! test -d "$sm_path"/.git &&
|
||||||
! test -f "$sm_path"/.git
|
! test -f "$sm_path"/.git
|
||||||
|
|
Загрузка…
Ссылка в новой задаче