Fix #1898: wrong order of pull and checkout

2016-09-18 15:46:33 +02:00 · 2016-09-18 15:46:33 +02:00 · f581b93d9b
commit f581b93d9b
parent 2a1b666a5e
1 changed files with 2 additions and 2 deletions
--- a/download_and_compile.sh
+++ b/download_and_compile.sh
@ -108,13 +108,13 @@ function _gitUpdate(){
  git diff --exit-code 2>&1 > /dev/null
  if [ $? != 1 ]; then
    set -e
-    git checkout -f $branch
    git pull -r
+    git checkout -f $branch
  else
    set -e
    git stash save -u -q
-    git checkout -f $branch
    git pull -r
+    git checkout -f $branch
    git stash pop -q
  fi
 }