[Android] Do not set error mode, since we use grep.

[Rafaël Carré]

Le 03/05/2012 12:09, Jean-Baptiste Kempf a écrit :
> android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu May  3 14:54:48 2012 +0200| [580483e145b7c48fd38ae85a7c1f87fdaa330cfa] | committer: Jean-Baptiste Kempf
> 
> Do not set error mode, since we use grep.
> 
> Error mode broke any version not NDKr7
> 
>> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=580483e145b7c48fd38ae85a7c1f87fdaa330cfa
> ---

> @@ -49,9 +47,11 @@ else
>      echo "VLC source found, updating"
>      cd vlc
>      git fetch origin
> -    if git branch | grep -q '* android$'; then
> +    if git branch | grep -q '.*android$'; then

This is not part of the commit log and I don't understand the regexp change:

% git branch
* master

It means master branch is currently checked out, thus the regexp matched
exactly: "* android" (starts with a star/asterisk)

> +        echo "Android branch found, merging"
>          git merge ${TESTED_HASH}
>      else
> +        echo "Creating android branch"

Previously if git branch outputted:

* master
android

It would go into that second case and checkout (NOT create) the branch,
because android was not the current branch.

>          git checkout -B android ${TESTED_HASH}
>      fi
>      cd -

I think it should be reverted