Skip to content

Commit 25b31f1

Browse files
bmwillgitster
authored andcommitted
submodule sync: use submodule--helper is-active
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e7849a9 commit 25b31f1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-submodule.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,14 +1089,14 @@ cmd_sync()
10891089
while read mode sha1 stage sm_path
10901090
do
10911091
die_if_unmatched "$mode" "$sha1"
1092-
name=$(git submodule--helper name "$sm_path")
10931092

10941093
# skip inactive submodules
1095-
if ! git config "submodule.$name.url" >/dev/null 2>/dev/null
1094+
if ! git submodule--helper is-active "$sm_path"
10961095
then
10971096
continue
10981097
fi
10991098

1099+
name=$(git submodule--helper name "$sm_path")
11001100
url=$(git config -f .gitmodules --get submodule."$name".url)
11011101

11021102
# Possibly a url relative to parent

0 commit comments

Comments
 (0)