Strip refs/heads in the branch sent to the manifest server.

The manifest server doesn't want to have refs/heads passed to it, so
we need to strip that when the branch contains it.

Change-Id: I044f8a9629220e886fd5e02e3c1ac4b4bb6020ba

1 files changed, 3 insertions, 0 deletions

diff --git a/subcmds/sync.py b/subcmds/sync.py
index 02dd82df..67213d3a 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -24,6 +24,7 @@ import time
 import xmlrpclib
 
 from git_command import GIT
+from git_refs import R_HEADS
 from project import HEAD
 from project import Project
 from project import RemoteSpec
@@ -205,6 +206,8 @@ uncommitted changes are present' % project.relpath
         p = self.manifest.manifestProject
         b = p.GetBranch(p.CurrentBranch)
         branch = b.merge
+        if branch.startswith(R_HEADS):
+          branch = branch[len(R_HEADS):]
 
         env = dict(os.environ)
         if (env.has_key('TARGET_PRODUCT') and