Fixes to roll_deps for the bots

tools/roll_deps.py

 #!/usr/bin/python2
 
 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Skia's Chromium DEPS roll script.
 
 This script:
@@ skipping 559 matching lines @@
             """Return true iff branch exists."""
             return 0 == vsp.call([git, 'show-ref', '--quiet', branch])
         def has_diff():
             """Return true iff repository has uncommited changes."""
             return bool(vsp.call([git, 'diff', '--quiet', 'HEAD']))
 
         self._stash = has_diff()
         if self._stash:
             vsp.check_call([git, 'stash', 'save'])
         try:
-            self._original_branch = vsp.strip_output(
-                [git, 'symbolic-ref', '--short', 'HEAD'])
+            full_branch = vsp.strip_output([git, 'symbolic-ref', 'HEAD'])
+            self._original_branch = full_branch.split('/')[-1]
         except (subprocess.CalledProcessError,):
             self._original_branch = vsp.strip_output(
                 [git, 'rev-parse', 'HEAD'])
 
         if not self._branch_name:
             self._branch_name = self._config.default_branch_name
 
         if branch_exists(self._branch_name):
             vsp.check_call([git, 'checkout', '-q', 'master'])
-            vsp.check_call([git, 'branch', '-q', '-D', self._branch_name])
+            vsp.check_call([git, 'branch', '-D', self._branch_name])
 
         vsp.check_call(
             [git, 'checkout', '-q', '-b', self._branch_name, 'origin/master'])
 
     def __exit__(self, etype, value, traceback):
         # pylint: disable=I0011,R0912
         git = self._config.git
         vsp = self._config.vsp
         svn_info = str(get_svn_revision(self._config, 'HEAD'))
 
@@ skipping 23 matching lines @@
             self.issue = vsp.strip_output([git, 'cl', 'issue'])
             if self._config.cl_bot_list:
                 vsp.check_call(git_try)
 
         # deal with the aftermath of failed executions of this script.
         if self._config.default_branch_name == self._original_branch:
             self._original_branch = 'master'
         vsp.check_call([git, 'checkout', '-q', self._original_branch])
 
         if self._config.default_branch_name == self._branch_name:
-            vsp.check_call([git, 'branch', '-q', '-D', self._branch_name])
+            vsp.check_call([git, 'branch', '-D', self._branch_name])
         if self._stash:
             vsp.check_call([git, 'stash', 'pop'])
 
 
 def change_skia_deps(revision, git_hash, depspath):
     """Update the DEPS file.
 
     Modify the skia_revision and skia_hash entries in the given DEPS file.
 
     Args:
@@ skipping 155 matching lines @@
     if not test_git_executable(options.git_path):
         option_parser.error('Invalid git executable.')
 
     config = DepsRollConfig(options)
     find_hash_and_roll_deps(config, options.revision, options.git_hash)
 
 
 if __name__ == '__main__':
     main(sys.argv[1:])