Fix git-cl when working on branches.

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 563 matching lines @@
     return remote, upstream_branch
 
   def GetCommonAncestorWithUpstream(self):
     return git_common.get_or_create_merge_base(self.GetBranch(),
                                                self.GetUpstreamBranch())
 
   def GetUpstreamBranch(self):
     if self.upstream_branch is None:
       remote, upstream_branch = self.FetchUpstreamTuple(self.GetBranch())
       if remote is not '.':
-        upstream_branch = upstream_branch.replace('heads', 'remotes/' + remote)
+        upstream_branch = upstream_branch.replace('refs/heads/',
+                                                  'refs/remotes/%s/' % remote)
+        upstream_branch = upstream_branch.replace('refs/branch-heads/',
+                                                  'refs/remotes/branch-heads/')
       self.upstream_branch = upstream_branch
     return self.upstream_branch
 
   def GetRemoteBranch(self):
     if not self._remote:
       remote, branch = None, self.GetBranch()
       seen_branches = set()
       while branch not in seen_branches:
         seen_branches.add(branch)
         remote, branch = self.FetchUpstreamTuple(branch)
@@ skipping 13 matching lines @@
                           self._remote,
                           GIT_INSTRUCTIONS_URL)
         else:
           logging.warn('Could not determine which remote this change is '
                        'associated with.  You may prevent this message by '
                        'running "git svn info" as documented here:  %s',
                        GIT_INSTRUCTIONS_URL)
         branch = 'HEAD'
       if branch.startswith('refs/remotes'):
         self._remote = (remote, branch)
+      elif branch.startswith('refs/branch-heads/'):
+        self._remote = (remote, branch.replace('refs/', 'refs/remotes/'))
       else:
         self._remote = (remote, 'refs/remotes/%s/%s' % (remote, branch))
     return self._remote
 
   def GitSanityChecks(self, upstream_git_obj):
     """Checks git repo status and ensures diff is from local commits."""
 
     # Verify the commit we're diffing against is in our current branch.
     upstream_sha = RunGit(['rev-parse', '--verify', upstream_git_obj]).strip()
     common_ancestor = RunGit(['merge-base', upstream_sha, 'HEAD']).strip()
@@ skipping 2109 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))