ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use FETCH_HEAD instead of 'origin' for git reset --hard

This commit is contained in:
aliaspider 2017-04-16 17:36:01 +01:00
parent 25e1c0190c
commit 672e931141
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretro-buildbot-recipe.sh
View File

@ -809,8 +809,8 @@ while read line; do
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state... " echo "resetting repo state... "
git reset --hard FETCH_HEAD
git clean -xdf git clean -xdf
git reset --hard origin
BUILD="YES" BUILD="YES"
fi fi
@ -926,8 +926,8 @@ while read line; do
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state... " echo "resetting repo state... "
git reset --hard FETCH_HEAD
git clean -xdf git clean -xdf
git reset --hard origin
BUILD="YES" BUILD="YES"
fi fi
cd $WORK cd $WORK
@ -957,8 +957,8 @@ while read line; do
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state $URL... " echo "resetting repo state $URL... "
git reset --hard FETCH_HEAD
git clean -xdf git clean -xdf
git reset --hard origin
BUILD="YES" BUILD="YES"
fi fi
OUT=`git submodule update --init --recursive` OUT=`git submodule update --init --recursive`
@ -1080,9 +1080,8 @@ buildbot_pull(){
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state $URL... " echo "resetting repo state $URL... "
git reset --hard FETCH_HEAD
git clean -xdf git clean -xdf
git reset --hard origin
git pull
BUILD="YES" BUILD="YES"
fi fi
elif [ "${TYPE}" = "SUBMODULE" ]; then elif [ "${TYPE}" = "SUBMODULE" ]; then
@ -1091,9 +1090,8 @@ buildbot_pull(){
BUILD="NO" BUILD="NO"
else else
echo "resetting repo state $URL... " echo "resetting repo state $URL... "
git reset --hard FETCH_HEAD
git clean -xdf git clean -xdf
git reset --hard origin
git pull
BUILD="YES" BUILD="YES"
git submodule update --init --recursive git submodule update --init --recursive
#git submodule foreach git pull origin master #git submodule foreach git pull origin master