mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

cros_mark_as_stable: delete merge_branch if it already exists

Browse Source 
Fixes issue with pfbb where commits aren't getting squashed

BUG=6102
TEST=Ran the code.

Change-Id: Ibbcb8882ee13abf3a7c283bb0d248eef8db31cb8

Review URL: http://codereview.chromium.org/3141045
This commit is contained in:
Mandeep Singh Baines 2010-08-25 19:05:45 -07:00
parent 1d5fc89649
commit f30a06ab91
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cros_mark_as_stable.py
View File

@ -110,6 +110,9 @@ def _PrintUsageAndDie(error_message=''):
else:
sys.exit(1)
def _BranchExists(name):
"""Returns True is the branch exists"""
return _RunCommand('git branch').split().count(name) != 0
def _PushChange():
"""Pushes changes to the git repository.
@ -135,6 +138,10 @@ def _PushChange():
description = 'Marking set of ebuilds as stable\n\n%s' % description
merge_branch_name = 'merge_branch'
_RunCommand('git remote update')
merge_branch = _GitBranch(merge_branch_name)
merge_branch.CreateBranch()
if not merge_branch.Exists():
generate_test_report.Die('Unable to create merge branch.')
_RunCommand('git checkout -b %s %s' % (
merge_branch_name, gflags.FLAGS.tracking_branch))
_RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)