update.sh: Only allow fast-forwards

This commit is contained in:
Nicolas Braud-Santoni 2015-12-29 20:34:33 +01:00 committed by mathieui
parent 161f44ce3b
commit dd992600f3

View file

@ -27,7 +27,7 @@ command -v $POEZIO_VENV_COMMAND > /dev/null 2>&1 || {
} }
echo 'Updating poezio' echo 'Updating poezio'
git pull origin master || { git pull --ff-only origin master || {
echo "The script failed to update poezio." echo "The script failed to update poezio."
exit 1 exit 1
} }