From fafb895a4c8ea54a49e0249d43dd99d9e4aba783 Mon Sep 17 00:00:00 2001 From: Mandeep Singh Baines Date: Thu, 26 Aug 2010 10:32:16 -0700 Subject: [PATCH] Fix prefligh buildbot BUG=none TEST=Ran it by hand and verified that the error message goes away. Before this change there is an error about merge_branch already existing. Change-Id: I8393da46d6bebf1f40d253863cfe4c28b76c1b8e Review URL: http://codereview.chromium.org/3127036 --- cros_mark_as_stable.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py index 83f878260f..2dbce35809 100755 --- a/cros_mark_as_stable.py +++ b/cros_mark_as_stable.py @@ -110,10 +110,6 @@ 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. @@ -142,8 +138,6 @@ def _PushChange(): 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) _RunCommand('git commit -m "%s"' % description) # Ugh. There has got to be an easier way to push to a tracking branch