Commit d96c4d46 authored by Carola Nitz's avatar Carola Nitz

compileAndBuildVLCKit: correct the order of pull rebase and reset hard to...

compileAndBuildVLCKit: correct the order of pull rebase and reset hard to check out the testedHash corretly
parent c2044e86
......@@ -1042,8 +1042,8 @@ if [ "$VLCROOT" = "" ]; then
cd ..
else
cd vlc
git reset --hard ${TESTEDHASH}
git pull --rebase
git reset --hard ${TESTEDHASH}
git am ${ROOT_DIR}/Resources/MobileVLCKit/patches/*.patch
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