From e0a3eef3ad5bb45a6967704531a303bc7ea7d865 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Fri, 17 Aug 2018 21:53:45 -0700 Subject: [PATCH] Squashed 'hack/libbuild/' changes from da3abb93..70ef1128 70ef1128 fix branch naming issue (#23) git-subtree-dir: hack/libbuild git-subtree-split: 70ef11282ee43c0ba11ee94e9e3d4d008b82498e --- concourse/init.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/concourse/init.sh b/concourse/init.sh index 5ca29aa5d..39caa28b1 100755 --- a/concourse/init.sh +++ b/concourse/init.sh @@ -20,9 +20,5 @@ pushd "$GOPATH"/src/github.com/$ORG_NAME/$REPO_NAME # this is necessary because operator image tag is based on branch name # for parallel tests, if two test build image of same tag, it'll create problem # one test may finish early and delete image while other is using it -if (git branch -m "$(git rev-parse --abbrev-ref HEAD)-$ClusterProvider"); then - true -else - git checkout -b $(git rev-parse --short HEAD)-$ClusterProvider -fi +git checkout -b $(git rev-parse --short HEAD)-$ClusterProvider popd