From: Angus Gratton <angus@espressif.com>
Date: Fri, 17 Mar 2017 04:00:25 +0000 (+0800)
Subject: ci: Fix master branch being pushed to master
X-Git-Tag: v2.1-rc1~254^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=364476c1cdc6aa74b592ea340478ddd3243ded00;p=esp-idf

ci: Fix master branch being pushed to master

Previous change in 8b6993f7 doesn't work if branch exists locally.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9818930c99..12714959b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -241,7 +241,7 @@ push_master_to_github:
     #
     # NB: In gitlab 9.x, CI_BUILD_REF was deprecated. New name is CI_COMMIT_REF. If below command suddenly
     # generates bash syntax errors, this is probably why.
-    - eval $(git for-each-ref --shell bash --format 'if [ $CI_BUILD_REF == %(objectname) ]; then git checkout -b %(refname:strip=3); git push --follow-tags github %(refname:strip=3); fi;' $GITHUB_PUSH_REFS)
+    - eval $(git for-each-ref --shell bash --format 'if [ $CI_BUILD_REF == %(objectname) ]; then git checkout -B %(refname:strip=3); git push --follow-tags github %(refname:strip=3); fi;' $GITHUB_PUSH_REFS)
 
 
 deploy_docs: