Change git-rebase-update to always keep branch 'master'.

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 sys
 
@@ skipping 102 matching lines @@
     with self.repo.open('bob', 'wb') as f:
       f.write('testing auto-freeze/thaw')
 
     output, _ = self.repo.capture_stdio(self.reup.main)
     self.assertIn('Cannot rebase-update', output)
 
     self.repo.run(self.nb.main, ['empty_branch'])
     self.repo.run(self.nb.main, ['--upstream-current', 'empty_branch2'])
 
     self.repo.git('checkout', 'branch_K')
+    self.repo.git('checkout', '-b', 'master', 'origin/master')

[M-A Ruel, 2014/11/25 20:38:31]

This doesn't add coverage for the 2 new lines, not sure why.

 
     output, _ = self.repo.capture_stdio(self.reup.main)
 
     self.assertIn('Rebasing: branch_G', output)
     self.assertIn('Rebasing: branch_K', output)
     self.assertIn('Rebasing: branch_L', output)
     self.assertIn('Rebasing: foobar', output)
     self.assertIn('Rebasing: sub_K', output)
     self.assertIn('Deleted branch branch_G', output)
     self.assertIn('Deleted branch empty_branch', output)
@@ skipping 200 matching lines @@
     """)
 
 
 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')
   )))