[PATCH v5 04/10] submodule sync: use submodule--helper is-active
From: Brandon Williams <hidden>
Date: 2017-03-18 00:36:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Brandon Williams <redacted> --- git-submodule.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh
index 577136148..db94dea3b 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -1089,14 +1089,14 @@ cmd_sync() while read mode sha1 stage sm_path do die_if_unmatched "$mode" "$sha1" - name=$(git submodule--helper name "$sm_path") # skip inactive submodules - if ! git config "submodule.$name.url" >/dev/null 2>/dev/null + if ! git submodule--helper is-active "$sm_path" then continue fi + name=$(git submodule--helper name "$sm_path") url=$(git config -f .gitmodules --get submodule."$name".url) # Possibly a url relative to parent
--
2.12.0.367.g23dc2f6d3c-goog