|
|
@ -77,6 +77,9 @@ function _do_update()
|
|
|
|
eval git reset --hard HEAD $OPT_VERBOSE_LOG
|
|
|
|
eval git reset --hard HEAD $OPT_VERBOSE_LOG
|
|
|
|
eval git clean -dxff $OPT_VERBOSE_LOG
|
|
|
|
eval git clean -dxff $OPT_VERBOSE_LOG
|
|
|
|
eval git fetch $OPT_VERBOSE_LOG
|
|
|
|
eval git fetch $OPT_VERBOSE_LOG
|
|
|
|
|
|
|
|
for _remote in `git remote`; do
|
|
|
|
|
|
|
|
eval git remote prune $_remote $OPT_VERBOSE_LOG
|
|
|
|
|
|
|
|
done
|
|
|
|
if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then
|
|
|
|
if [[ $(git rev-parse HEAD) != $(git rev-parse "origin/$BRANCH") ]]; then
|
|
|
|
eval git pull --rebase $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
|
|
|
|
eval git pull --rebase $GIT_NO_RECURSE_SUBMODULES $OPT_VERBOSE_LOG
|
|
|
|
if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then
|
|
|
|
if [[ `git rev-parse HEAD` == `git rev-parse "origin/$BRANCH"` ]]; then
|
|
|
|