From a8fe8d4fe9868b11bf6417e4b9b6b3e50d637b69 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer<michaelni@gmx.at>
Date: Tue, 29  Oct  2013  20:45:18  +0000
Subject: Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---
diff --git a/tests/fate.sh b/tests/fate.sh
index c474be7..69dcdd6 100755
--- a/tests/fate.sh
+++ b/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
 )
 
--
cgit