tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default base is master 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-04-19 15:24:41 -07:00
parent e7086091be
commit 8511570764
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:
base = self.git_repo.tag('refs/tags/{}'.format(base))
else:
base = 'refs/remotes/{}/automated-releases'.format(remote.name)
base = 'refs/remotes/{}/master'.format(remote.name)
release_branch = self.git_repo.create_head(branch_name(version), commit=base)
release_branch.checkout()
self.git_repo.git.merge('--strategy=ours', '--no-edit', '{}/release'.format(remote.name))