Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(770)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cros_mark_as_stable.py

Issue 3127036: Fix prefligh buildbot (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cros_mark_as_stable.py
diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py
index 83f878260feb03617aa4ac134620d813d2cc3cfa..2dbce35809a3c48a9e553ffc45c90f81dcc954d5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698