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

Unified Diff: cros_mark_as_stable.py

Issue 3130031: Don't mask out errors in cros_mark_as_stable (Closed) Base URL: http://src.chromium.org/git/crosutils.git
Patch Set: Try leftover 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 75154f9e701bb0c5ffe78efe4ac2059e86a00db5..4cf93cbe47b0d598ea4f8722f4c63e6597cac6db 100755
--- a/cros_mark_as_stable.py
+++ b/cros_mark_as_stable.py
@@ -137,15 +137,11 @@ def _PushChange():
_RunCommand('git remote update')
_RunCommand('git checkout -b %s %s' % (
merge_branch_name, gflags.FLAGS.tracking_branch))
- try:
- _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
- _RunCommand('git config push.default tracking')
- _RunCommand('git push')
- finally:
- _RunCommand('git checkout %s' % _STABLE_BRANCH_NAME)
- _RunCommand('git branch -D %s' % merge_branch_name)
+ _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
+ _RunCommand('git config push.default tracking')
+ _RunCommand('git push')
Chris Masone 2010/08/19 00:47:51 Ok...so now what happens if there's an error?
def _RunCommand(command):
« 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