From e3a38f76e1562a5c92449985e65ed79fe4f52022 Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 29 Nov 2017 17:45:17 -0800 Subject: [PATCH] libretro-buildbot-recipe.sh: Check if the HEAD commit is new or not. Newer git versions now report 'Already up to date.' instead of 'Already up-to-date' so we need a more robust solution. --- libretro-buildbot-recipe.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index ab389bc1..59f46574 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -812,10 +812,10 @@ while read line; do fi echo "pulling changes from repo $URL..." - OUT="$(git pull)" - echo "$OUT" + HEAD="$(git rev-parse HEAD)" + git pull - if [[ $OUT == *"Already up-to-date"* ]] && [ "${BUILD}" != "YES" ]; then + if [ "$HEAD" = "$(git rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then BUILD="NO" else echo "resetting repo state $URL..." @@ -944,12 +944,12 @@ buildbot_pull(){ fi echo "pulling changes from repo $URL... " - OUT=`git pull` - echo $OUT + HEAD="$(git rev-parse HEAD)" + git pull if [ "${TYPE}" = "PROJECT" ]; then RADIR=$DIR - if [[ $OUT == *"Already up-to-date"* ]] && [ ! "${BUILD}" = "YES" ]; then + if [ "$HEAD" = "$(git rev-parse HEAD)" ] && [ "${BUILD}" != "YES" ]; then BUILD="NO" else echo "resetting repo state $URL... "