diff options
Diffstat (limited to 'debian/_buildscripts/local/update_repositories.sh')
| -rwxr-xr-x | debian/_buildscripts/local/update_repositories.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/_buildscripts/local/update_repositories.sh b/debian/_buildscripts/local/update_repositories.sh index 5f0b5758f..91425f8a7 100755 --- a/debian/_buildscripts/local/update_repositories.sh +++ b/debian/_buildscripts/local/update_repositories.sh @@ -68,7 +68,7 @@ function _do_update() "fetch") if [[ -z `grep "^$BRANCH - $MOD_PATH$" "$UPDATE_LOCK_FILENAME"` ]]; then cd "$MOD_PATH" &>/dev/null - eval git fetch --all --prune $OPT_VERBOSE_LOG + eval git fetch --all --prune $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG if [ $? -eq 0 ]; then RESULT="OK" else @@ -104,7 +104,7 @@ function _do_update() eval git reset --hard HEAD $OPT_VERBOSE_LOG eval git clean -dxff $OPT_VERBOSE_LOG if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then - eval git pull --rebase $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG + eval git rebase $OPT_VERBOSE_LOG if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then RESULT="UPDATE" else |