mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 22:16:58 +02:00
Simplify and clearify push logic.
Change-Id: I5366fb930ca76f596f49d0312228aa5beeccbc31 BUG=chromium-os:8693 TEST=Ran it with and without dryrun and chrome uprev. Review URL: http://codereview.chromium.org/5846005
This commit is contained in:
parent
78bc7d7415
commit
e516dae950
@ -252,7 +252,7 @@ def PushChange(stable_branch, tracking_branch):
|
||||
merge_branch_name = 'merge_branch'
|
||||
for push_try in range(num_retries + 1):
|
||||
try:
|
||||
_SimpleRunCommand('git remote update')
|
||||
_SimpleRunCommand('repo sync .')
|
||||
merge_branch = GitBranch(merge_branch_name, tracking_branch)
|
||||
merge_branch.CreateBranch()
|
||||
if not merge_branch.Exists():
|
||||
|
Loading…
Reference in New Issue
Block a user