[FFmpeg-cvslog] fate.sh: Allow non-fast-forwards when updating sources

Diego Biurrun git at videolan.org
Tue Oct 29 22:02:55 CET 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Oct 25 15:21:44 2013 +0200| [9510d7689e236f6a4748795604fba427c130d0ad] | committer: Diego Biurrun

fate.sh: Allow non-fast-forwards when updating sources

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9510d7689e236f6a4748795604fba427c130d0ad
---

 tests/fate.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate.sh b/tests/fate.sh
index 7505181..6e0c0c6 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
 )
 



More information about the ffmpeg-cvslog mailing list