From 7e23a1ee30a44babc95d17e3ecbb233e14f650c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 5 May 2013 02:30:01 +0200 Subject: Added ignore-submodules flag, depending on the GIT version --- update_all_submodules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'update_all_submodules') diff --git a/update_all_submodules b/update_all_submodules index 498dcef..563b3bd 100755 --- a/update_all_submodules +++ b/update_all_submodules @@ -19,12 +19,17 @@ if [[ -z "$branch" ]] || exit 1 fi +# check git abilities +if [[ -n "`git status --help 2>/dev/null|grep -- '--ignore-submodules'`" ]]; then + GIT_IGNORE_SUBMODULES="--ignore-submodules" +fi + touch /var/lock/update-tde-git-submodules PARENTDIR=$PWD echo "Working in $PARENTDIR" git pull -if [[ ! -z "`git status --porcelain`" ]]; then +if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then git reset --hard HEAD git clean -dxff fi @@ -44,7 +49,7 @@ do git submodule update fi cd $PARENTDIR/$DIR2UPDATE - if [[ ! -z "`git status --porcelain`" ]]; then + if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then git reset --hard HEAD git clean -dxff fi -- cgit v1.2.3