Browse Source

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

pull/1/head
Timothy Pearson 10 years ago
parent
commit
c2cf6015ae
  1. 4
      switch_all_submodules_to_head_and_clean
  2. 4
      update_all_submodules

4
switch_all_submodules_to_head_and_clean

@ -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

4
update_all_submodules

@ -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

Loading…
Cancel
Save