[MPlayer-users] git checkout failure under Ubuntu Hardy

[mlg 3]

Since I really hate having to rm -rf ffmpeg each time, can someone, please, unless you have any objections, commit this or some equivalent:

$ svn diff
Index: configure
===================================================================
--- configure(revision 34413)
+++ configure(working copy)
@@ -41,9 +41,16 @@
 fi
 
 if test -e ffmpeg/mp_auto_pull ; then
-    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
-        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
-        exit 1
+    if [ "`git --version`" \< "git version 1.6.6" ] ; then
+if ! (cd ffmpeg && git pull --rebase) ; then
+        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+        exit 1
+fi
+    else
+if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+        exit 1
+fi
     fi
 fi