Remove ignore-submodules flag from git commands in order to support older GIT versions

(cherry picked from commit 3f91377dc9f4caf3269679045215de90c8491b77)
12 years ago · b0a915240f
parent 4816dfe852
commit b0a915240f
2 changed files with 4 additions and 4 deletions
--- a/4
+++ b/4
@ -35,12 +35,12 @@ if [[ ! -e "$THISSCRIPT" ]]; then
 	exit 1
 fi

-if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
+if [[ ! -z "`git status --porcelain`" ]]; then
 	git reset --hard HEAD
 	git clean -dxff
 fi
 git pull
-if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
+if [[ ! -z "`git status --porcelain`" ]]; then
 	git reset --hard HEAD
 	git clean -dxff
 fi
--- a/4
+++ b/4
@ -24,7 +24,7 @@ touch /var/lock/update-tde-git-submodules
 PARENTDIR=$PWD
 echo "Working in $PARENTDIR"
 git pull
-if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
+if [[ ! -z "`git status --porcelain`" ]]; then
 	git reset --hard HEAD
 	git clean -dxff
 fi
@ -44,7 +44,7 @@ do
 			git submodule update
 		fi
 		cd $PARENTDIR/$DIR2UPDATE
-		if [[ ! -z "`git status --porcelain --ignore-submodules`" ]]; then
+		if [[ ! -z "`git status --porcelain`" ]]; then
 			git reset --hard HEAD
 			git clean -dxff
 		fi