[Android] Don't silently delete patches

[Rafaël Carré]

android | branch: master | Rafaël Carré <funman at videolan.org> | Fri Apr 13 16:51:38 2012 -0400| [3c07f20844b017b87a2e8bd0a4b7bc49f70e873d] | committer: Rafaël Carré

Don't silently delete patches

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=3c07f20844b017b87a2e8bd0a4b7bc49f70e873d
---

 compile.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/compile.sh b/compile.sh
index 958a45d..71a71ba 100755
--- a/compile.sh
+++ b/compile.sh
@@ -47,7 +47,11 @@ else
     echo "VLC source found, updating"
     cd vlc
     git fetch origin
-    git checkout -B android ${TESTED_HASH}
+    if git branch --list | grep -qw android; then
+        git merge ${TESTED_HASH}
+    else
+        git checkout -B android ${TESTED_HASH}
+    fi
     cd -
 fi