Fix git branch parsing.

tests/git_rebase_update_test.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_rebase_update.py"""
 
 import os
-import unittest
 import sys
 
 DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, DEPOT_TOOLS_ROOT)
 
 from testing_support import coverage_utils
 from testing_support import git_test_utils
 
 class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase):
   REPO_SCHEMA = """
@@ skipping 42 matching lines @@
     self.repo.git('branch', '--set-upstream-to', 'branch_G', 'branch_K')
     self.repo.git('branch', '--set-upstream-to', 'branch_K', 'branch_L')
     self.repo.git('branch', '--set-upstream-to', 'origin/master', 'branch_G')
 
     self.repo.to_schema_refs += ['origin/master']
 
   def tearDown(self):
     self.origin.nuke()
     super(GitRebaseUpdateTest, self).tearDown()
 
-  @unittest.skip('broken by git 2.4')
   def testRebaseUpdate(self):
     self.repo.git('checkout', 'branch_K')
 
     self.repo.run(self.nb.main, ['foobar'])
     self.assertEqual(self.repo.git('rev-parse', 'HEAD').stdout,
                      self.repo.git('rev-parse', 'origin/master').stdout)
 
     with self.repo.open('foobar', 'w') as f:
       f.write('this is the foobar file')
     self.repo.git('add', 'foobar')
@@ skipping 252 matching lines @@
                   M H I J K L
     """)
 
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main((
     os.path.join(DEPOT_TOOLS_ROOT, 'git_rebase_update.py'),
     os.path.join(DEPOT_TOOLS_ROOT, 'git_new_branch.py'),
     os.path.join(DEPOT_TOOLS_ROOT, 'git_reparent_branch.py'),
     os.path.join(DEPOT_TOOLS_ROOT, 'git_rename_branch.py')
-  ), required_percentage=85.0))
+  )))