fly/fgmeta
1
0
Fork 0
Code Activity

Fix #1898: wrong order of pull and checkout

Browse source
This commit is contained in:
Torsten Dreyer 2016-09-18 15:46:33 +02:00
parent 2a1b666a5e
commit f581b93d9b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download_and_compile.sh
View file

@ -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
}