Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ewout ter Hoeven
VLC-Android
Commits
924d4c52
Commit
924d4c52
authored
Apr 29, 2012
by
Rafaël Carré
Browse files
No need to use --list (fix compatibility with git < 1.7.8)
parent
49992ba9
Changes
1
Hide whitespace changes
Inline
Side-by-side
compile.sh
View file @
924d4c52
...
...
@@ -47,7 +47,7 @@ else
echo
"VLC source found, updating"
cd
vlc
git fetch origin
if
git branch
--list
|
grep
-q
w
android
;
then
if
git branch |
grep
-q
'*
android
$'
;
then
git merge
${
TESTED_HASH
}
else
git checkout
-B
android
${
TESTED_HASH
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment