commit ffb6c0f80fa78626d1e92a65836676484892c0ae
author Roman Vyalov <rvyalov@mirantis.com> Mon Oct 29 12:34:49 2018 +0000
committer Gerrit Code Review <mail@domain.com> Mon Oct 29 12:34:49 2018 +0000
tree 1733528f2d63d94508a1a35c11c39c9e645b4016
parent de0cb40d3b3453829cc3b3f047b69a3486c16acc
parent 28eb6bdc1535d35250c620e59c9ddddd4c6f350a

Merge "Revert "Fix git branch repos pipeline""

branch-git-repos.groovy

diff --git a/branch-git-repos.groovy b/branch-git-repos.groovy
index b5a65b5..0624c40 100644
--- a/branch-git-repos.groovy
+++ b/branch-git-repos.groovy
@@ -110,14 +110,14 @@
                 sh 'git config user.email "ci+infra@mirantis.com"'
 
                 // Update list of branches
-                sh 'git fetch --prune --tags'
+                sh 'git remote update origin --prune'
 
                 // Ensure there is no branch or tag with gitBranchNew name
                 sh "git branch -d '${gitBranchNew}' && git push origin ':${gitBranchNew}' || :"
                 sh "git tag    -d '${gitBranchNew}' && git push origin ':refs/tags/${gitBranchNew}' || :"
 
                 // Create new branch
-                sh "git branch '${gitBranchNew}' '${gitSrcObj}'"      // Create new local branch
+                sh "git checkout -b '${gitBranchNew}' '${gitSrcObj}'" // Create new local branch
                 sh "git push origin '${gitBranchNew}'"                // ... push new branch
             }
         }