summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-09-27 15:46:16 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-09-27 15:46:16 -0300
commit167abecea98e0357912149897adce15e09a4e084 (patch)
tree7d3c92666129cad89b11dcb6b15695ef22fe0729
parent6ddc38fe20770ed61d092cf69ad618b6ca3fcea4 (diff)
downloadpuppet-puppet-167abecea98e0357912149897adce15e09a4e084.tar.gz
puppet-puppet-167abecea98e0357912149897adce15e09a4e084.tar.bz2
Use --recursive on git submodule update
-rw-r--r--files/update-puppet-conf.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/files/update-puppet-conf.sh b/files/update-puppet-conf.sh
index 9a2dd65..c8a8370 100644
--- a/files/update-puppet-conf.sh
+++ b/files/update-puppet-conf.sh
@@ -16,6 +16,6 @@ if [ -d "${PUPPET_DIR}/.git" ] && [ -d "${ORIGIN_DIR}" ]; then
git reset HEAD --hard || exit $?
git pull ${ORIGIN_DIR} master || exit $?
# See https://github.com/git/git/commit/c1c259e225cf39c7353c673ad2c7c84450d909c1
- git submodule update --init | grep -v "^Submodule "
+ git submodule update --init --recursive | grep -v "^Submodule "
git clean -d -f
fi