Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build: use git checkout -f 

this is an attempt to avoid CRLF attributes breakage with builds
This commit is contained in:
Andrew Tridgell 2015-04-20 08:59:50 +10:00
parent ffd4662ec4
commit 4fe39c67b4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tools/scripts/build_binaries.sh
View File

@ -10,7 +10,7 @@ rm -rf $TMPDIR
echo "Building in $TMPDIR"
date
git checkout master
git checkout -f master
githash=$(git rev-parse HEAD)
hdate=$(date +"%Y-%m/%Y-%m-%d-%H:%m")
@ -40,12 +40,12 @@ checkout() {
echo "Checkout for $vehicle for $board with tag $tag"
git checkout "$vtag" || git checkout "$vtag2" || return 1
git checkout -f "$vtag" || git checkout -f "$vtag2" || return 1
git log -1
pushd ../../PX4NuttX
git checkout "$vtag" || git checkout "$vtag2" || git checkout master || {
git checkout -f "$vtag" || git checkout -f "$vtag2" || git checkout -f master || {
popd
return 1
}
@ -53,7 +53,7 @@ checkout() {
popd
pushd ../../PX4Firmware
git checkout "$vtag" || git checkout "$vtag2" || git checkout master || {
git checkout -f "$vtag" || git checkout -f "$vtag2" || git checkout -f master || {
popd
return 1
}