Merge commit 'e0a3eef3ad5bb45a6967704531a303bc7ea7d865'

stashed · Aug 18, 2018 · 7a3d3a6 · 7a3d3a6
2 parents 7ecb7aa + e0a3eef
commit 7a3d3a6
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/hack/libbuild/concourse/init.sh b/hack/libbuild/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