Don't silently delete patches

3c07f208 · Rafaël Carré · 9f3cd727 · 3c07f208
Commit 3c07f208 authored Apr 13, 2012 by Rafaël Carré
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

compile.sh compile.sh +5 -1

No files found.
--- 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