From a33a445a8d09e974bad14f607cbff63a39ca6009 Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Wed, 18 Aug 2010 18:03:46 -0700 Subject: [PATCH] Don't mask out errors in cros_mark_as_stable Change-Id: Ib6722b99008f8515aecc3f27896963291d197947 Review URL: http://codereview.chromium.org/3130031 --- cros_mark_as_stable.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cros_mark_as_stable.py b/cros_mark_as_stable.py index 75154f9e70..4cf93cbe47 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') def _RunCommand(command):