aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-10-25 15:21:44 +0200
committerDiego Biurrun <diego@biurrun.de>2013-10-29 14:46:28 +0100
commit9510d7689e236f6a4748795604fba427c130d0ad (patch)
tree259e78e99f2cc7a5af68c9df9e8b293ae6f8af39
parentc872d310cd9c605e5f994ad8ac79dc72303c0d29 (diff)
downloadffmpeg-9510d7689e236f6a4748795604fba427c130d0ad.tar.gz
fate.sh: Allow non-fast-forwards when updating sources
-rwxr-xr-xtests/fate.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate.sh b/tests/fate.sh
index 7505181ca5..6e0c0c634a 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
)