From 924d4c529931664a952aab56a53e26d7e03a4529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 29 Apr 2012 16:34:17 -0400 Subject: [PATCH] No need to use --list (fix compatibility with git < 1.7.8) --- compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compile.sh b/compile.sh index 299f627e7..9451583cb 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} -- GitLab