Lubuntu/ci-tooling
8
0
Fork 0
mirror of https://github.com/lubuntu-team/ci-tooling.git synced 2025-11-04 07:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

If the branch already exists, don't create it again.

Browse Source
This commit is contained in:
Simon Quigley 2020-04-23 04:36:31 -05:00
parent a8aec7fc37
commit 17e3f7dc47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/merger.xml
View File

@ -56,10 +56,10 @@
<command>
cd {{ NAME }}
git checkout {{ DEFAULT_BRANCH }}
git checkout -b {{ PACKAGING_BRANCH_S }} || git checkout {{ PACKAGING_BRANCH_S }}
git branch -a | egrep "remotes/origin/{{ PACKAGING_BRANCH_S }}" && git checkout {{ PACKAGING_BRANCH_S }} || git checkout -b {{ PACKAGING_BRANCH_S }}
git merge --ff-only {{ DEFAULT_BRANCH }}
git push --set-upstream origin {{ PACKAGING_BRANCH_S }}
git checkout -b {{ PACKAGING_BRANCH_U }} || git checkout {{ PACKAGING_BRANCH_U }}
git branch -a | egrep "remotes/origin/{{ PACKAGING_BRANCH_U }}" && git checkout {{ PACKAGING_BRANCH_U }} || git checkout -b {{ PACKAGING_BRANCH_U }}
git merge --ff-only {{ PACKAGING_BRANCH_S }}
git push --set-upstream origin {{ PACKAGING_BRANCH_U }}
</command>