Added hyphen-only options

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 67 matching lines @@
     with self.repo.open('foobar', 'w') as f:
       f.write('this is the foobar file')
     self.repo.git('add', 'foobar')
     self.repo.git_commit('foobar1')
 
     with self.repo.open('foobar', 'w') as f:
       f.write('totes the Foobar file')
     self.repo.git_commit('foobar2')
 
     self.repo.git('checkout', 'branch_K')
-    self.repo.run(self.nb.main, ['--upstream_current', 'sub_K'])
+    self.repo.run(self.nb.main, ['--upstream-current', 'sub_K'])
     with self.repo.open('K', 'w') as f:
       f.write('This depends on K')
     self.repo.git_commit('sub_K')
 
     self.repo.run(self.nb.main, ['old_branch'])
     self.repo.git('reset', '--hard', self.repo['A'])
     with self.repo.open('old_file', 'w') as f:
       f.write('old_files we want to keep around')
     self.repo.git('add', 'old_file')
     self.repo.git_commit('old_file')
@@ skipping 11 matching lines @@
     self.assertEquals(self.repo['A'], self.origin['A'])
     self.assertEquals(self.repo['E'], self.origin['E'])
 
     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.run(self.nb.main, ['--upstream-current', 'empty_branch2'])
 
     self.repo.git('checkout', 'branch_K')
 
     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)
@@ skipping 202 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')
   )))