Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad': fate.sh: Allow non-fast-forwards when updating sources Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 21:45:18 +01:00 · 2013-10-29 21:45:18 +01:00 · a8fe8d4fe9
parent 0460b9bb3e 9510d7689e
commit a8fe8d4fe9
1 changed files with 1 additions and 1 deletions
--- 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
 )