Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:45:18 +0000 (21:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 20:50:49 +0000 (21:50 +0100)
* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate.sh

index c474be7..69dcdd6 100755 (executable)
@@ -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
 )