Commit 8dd7e38a authored by Soomin Lee's avatar Soomin Lee

buildscript: Use git fetch instead of git pull for vlc git

If the vlc directory is already dirty(patches have been applied before)
the build will possibly fail on `git pull --rebase` due conflicts.

If the developer wants to rebase some current work, `-n` option should be considered.
parent 525409ee
......@@ -1043,7 +1043,7 @@ if [ "$VLCROOT" = "" ]; then
cd ..
else
cd vlc
git pull --rebase
git fetch --all
git reset --hard ${TESTEDHASH}
git am ${ROOT_DIR}/Resources/MobileVLCKit/patches/*.patch
cd ..
......
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