From 25b4b63364b3c4a9b2bc45f994d363ffba1e05cc Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 5 Feb 2019 14:21:00 -0500 Subject: [PATCH] check_submodules.sh don't force update in CI --- Tools/check_submodules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index 95b61f620b..66891809ea 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -6,12 +6,12 @@ function check_git_submodule { if [[ -f $1"/.git" || -d $1"/.git" ]]; then - # CI environment always force update everything + # CI environment always update if [ "$CI" == "true" ]; then git submodule --quiet sync --recursive -- $1 - git submodule --quiet update --init --recursive --force -- $1 || true - git submodule --quiet update --init --recursive --force -- $1 + git submodule --quiet update --init --recursive -- $1 || true + git submodule --quiet update --init --recursive -- $1 exit 0 fi