diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index a5f1fc6b..6152aae8 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -750,6 +750,9 @@ while read line; do BUILD="YES" else cd $DIR + echo "resetting repo state... " + git clean -xdf + git reset --hard echo "pulling changes from repo... " OUT=`git pull` @@ -858,6 +861,9 @@ while read line; do if [ -d "${DIR}/.git" ]; then cd $DIR + echo "resetting repo state... " + git clean -xdf + git reset --hard echo "pulling changes from repo... " OUT=`git pull` @@ -880,6 +886,9 @@ while read line; do if [ -d "${DIR}/.git" ]; then cd $DIR + echo "resetting repo state... " + git clean -xdf + git reset --hard echo "pulling changes from repo... " OUT=`git pull` @@ -991,8 +1000,10 @@ buildbot_pull(){ if [ -d "${PARENTDIR}/${DIR}/.git" ]; then cd $PARENTDIR cd $DIR - echo "pulling changes from repo... " + echo "resetting repo state... " + git clean -xdf git reset --hard + echo "pulling changes from repo... " OUT=`git pull` echo $OUT if [ "${TYPE}" = "PROJECT" ]; then