From 6f2911b5b29579ba394afb6df06bc243295c5371 Mon Sep 17 00:00:00 2001 From: Michael Sweet Date: Thu, 17 Mar 2016 10:34:53 -0400 Subject: Use --recursive pull to pick up changes from upstream. --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 15ab96da2..0c1dd6e0a 100755 --- a/build.sh +++ b/build.sh @@ -105,7 +105,7 @@ echo "Starting build of '$targets' on `date`" if test -f git.log; then # Show Subversion updates... - echo git pull; git submodule update stable; git submodule update development + echo git pull --recurse-submodules; git submodule update --recursive cat git.log git status | $grep modified: >git.log if test -s git.log; then @@ -121,7 +121,7 @@ fi # Update and then build safely... if test $update = yes; then cd $BASEDIR - (git pull; git submodule update stable; git submodule update development) 2>&1 >git.log + (git pull --recurse-submodules; git submodule update --recursive) 2>&1 >git.log # Need to exec since this script might change... options="" -- cgit v1.2.1