tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Temp test

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-04-18 17:02:15 -07:00
parent ae6dd8a93c
commit 6a71040514
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script/release/release/repository.py
View File

@ -36,7 +36,7 @@ class Repository(object):
if base is not None: if base is not None:
base = self.git_repo.tag('refs/tags/{}'.format(base)) base = self.git_repo.tag('refs/tags/{}'.format(base))
else: else:
base = 'refs/remotes/{}/master'.format(remote.name) base = 'refs/remotes/{}/automated-releases'.format(remote.name)
release_branch = self.git_repo.create_head(branch_name(version), commit=base) release_branch = self.git_repo.create_head(branch_name(version), commit=base)
release_branch.checkout() release_branch.checkout()
self.git_repo.git.merge('--strategy=ours', '--no-edit', '{}/release'.format(remote.name)) self.git_repo.git.merge('--strategy=ours', '--no-edit', '{}/release'.format(remote.name))