Commit 3c07f208 authored by Rafaël Carré's avatar Rafaël Carré

Don't silently delete patches

parent 9f3cd727
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment