From 4eeb97c278b70445d0d6bb0a1779282d5aeffd01 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Fri, 20 Oct 2017 09:43:43 +0000 Subject: [PATCH] Fix branch check for proposal script We no longer have remote branches in our git clones, just check for the proper local branch to exist. Change-Id: I43b9f10c3b41c6cb3eb215d6d4552f2205e76012 --- jenkins/scripts/propose_update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/propose_update.sh b/jenkins/scripts/propose_update.sh index 2fed021b41..ae9e1aa461 100755 --- a/jenkins/scripts/propose_update.sh +++ b/jenkins/scripts/propose_update.sh @@ -122,9 +122,9 @@ for PROJECT in $PROJECTS; do fi pushd $PROJECT_DIR - # check whether the project has this branch or a suitable fallback + # check whether the project has this branch BRANCH="" - if git branch -a | grep -q "^ remotes/origin/$ZUUL_REFNAME$" ; then + if git branch | grep -q "^ $ZUUL_REFNAME$" ; then BRANCH=$ZUUL_REFNAME fi