Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>

tests/fate.sh

@@ -35,7 +35,7 @@ checkout(){
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git pull --quiet ;;
+        git:*) git fetch --force; git reset --hard origin/master ;;
     esac
 )