diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/switch_all_submodules_to_head_and_clean | 4 | ||||
| -rwxr-xr-x | scripts/update_all_submodules | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/switch_all_submodules_to_head_and_clean b/scripts/switch_all_submodules_to_head_and_clean index 017153719..631381272 100755 --- a/scripts/switch_all_submodules_to_head_and_clean +++ b/scripts/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 diff --git a/scripts/update_all_submodules b/scripts/update_all_submodules index 8e6668f8a..498dceff0 100755 --- a/scripts/update_all_submodules +++ b/scripts/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 |