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

Missed tracking branch to re-open tree.

Browse Source 
Change-Id: I2331cb6eda8c49111f30b62c42946952e450741f

TBR=davidjames
This commit is contained in:
Chris Sosa 2010-11-18 15:31:52 -08:00
parent a74ee71048
commit 0b9f24e9be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cros_mark_as_stable.py
View File

@ -250,7 +250,7 @@ def PushChange(stable_branch, tracking_branch):
for push_try in range(num_retries + 1): for push_try in range(num_retries + 1):
try: try:
_SimpleRunCommand('git remote update') _SimpleRunCommand('git remote update')
merge_branch = GitBranch(merge_branch_name) merge_branch = GitBranch(merge_branch_name, gflags.FLAGS.tracking_branch)
merge_branch.CreateBranch() merge_branch.CreateBranch()
if not merge_branch.Exists(): if not merge_branch.Exists():
Die('Unable to create merge branch.') Die('Unable to create merge branch.')