[Android] No need to use --list (fix compatibility with git < 1.7.8)
    Rafaël Carré 
    git at videolan.org
       
    Sun Apr 29 22:35:15 CEST 2012
    
    
  
android | branch: master | Rafaël Carré <funman at videolan.org> | Sun Apr 29 16:34:17 2012 -0400| [924d4c529931664a952aab56a53e26d7e03a4529] | committer: Rafaël Carré
No need to use --list (fix compatibility with git < 1.7.8)
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=924d4c529931664a952aab56a53e26d7e03a4529
---
 compile.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/compile.sh b/compile.sh
index 299f627..9451583 100755
--- a/compile.sh
+++ b/compile.sh
@@ -47,7 +47,7 @@ else
     echo "VLC source found, updating"
     cd vlc
     git fetch origin
-    if git branch --list | grep -qw android; then
+    if git branch | grep -q '* android$'; then
         git merge ${TESTED_HASH}
     else
         git checkout -B android ${TESTED_HASH}
    
    
More information about the Android
mailing list