Skip to content
Merged
Prev Previous commit
Next Next commit
Default base is master
Signed-off-by: Joffrey F <[email protected]>
  • Loading branch information
shin- committed Apr 19, 2018
commit 85115707645f7e134023a9635d5926fde7ccef8e
2 changes: 1 addition & 1 deletion script/release/release/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def create_release_branch(self, version, base=None):
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))
Expand Down