From 672e9311414631ac22dcc091bc39d323e7ac79bd Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sun, 16 Apr 2017 17:36:01 +0100 Subject: [PATCH] use FETCH_HEAD instead of 'origin' for git reset --hard --- libretro-buildbot-recipe.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index a7cff0e2..4f2c93cb 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -809,8 +809,8 @@ while read line; do BUILD="NO" else echo "resetting repo state... " + git reset --hard FETCH_HEAD git clean -xdf - git reset --hard origin BUILD="YES" fi @@ -926,8 +926,8 @@ while read line; do BUILD="NO" else echo "resetting repo state... " + git reset --hard FETCH_HEAD git clean -xdf - git reset --hard origin BUILD="YES" fi cd $WORK @@ -957,8 +957,8 @@ while read line; do BUILD="NO" else echo "resetting repo state $URL... " + git reset --hard FETCH_HEAD git clean -xdf - git reset --hard origin BUILD="YES" fi OUT=`git submodule update --init --recursive` @@ -1080,9 +1080,8 @@ buildbot_pull(){ BUILD="NO" else echo "resetting repo state $URL... " + git reset --hard FETCH_HEAD git clean -xdf - git reset --hard origin - git pull BUILD="YES" fi elif [ "${TYPE}" = "SUBMODULE" ]; then @@ -1091,9 +1090,8 @@ buildbot_pull(){ BUILD="NO" else echo "resetting repo state $URL... " + git reset --hard FETCH_HEAD git clean -xdf - git reset --hard origin - git pull BUILD="YES" git submodule update --init --recursive #git submodule foreach git pull origin master