diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-07 20:59:01 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-08 11:59:36 +0100 |
| commit | b0a915240f92352cf9675146940d045f76ee7746 (patch) | |
| tree | f0e4088cc704834f94a36d803515e0906c426df3 | |
| parent | 4816dfe85261c07f53930c37957b965586e06b70 (diff) | |
| download | scripts-b0a915240f92352cf9675146940d045f76ee7746.tar.gz scripts-b0a915240f92352cf9675146940d045f76ee7746.zip | |
Remove ignore-submodules flag from git commands in order to support older GIT versions
(cherry picked from commit 3f91377dc9f4caf3269679045215de90c8491b77)
| -rwxr-xr-x | switch_all_submodules_to_head_and_clean | 4 | ||||
| -rwxr-xr-x | update_all_submodules | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/switch_all_submodules_to_head_and_clean b/switch_all_submodules_to_head_and_clean index 0171537..6313812 100755 --- a/switch_all_submodules_to_head_and_clean +++ b/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/update_all_submodules b/update_all_submodules index 8e6668f..498dcef 100755 --- a/update_all_submodules +++ b/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 |