From f581b93d9b8fe857d6e27e21ce9bc24507088f22 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Sun, 18 Sep 2016 15:46:33 +0200 Subject: [PATCH] Fix #1898: wrong order of pull and checkout --- download_and_compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 034c5a3..cfac4cf 100755 --- 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 }