android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Nico Sallembien 2010-04-26 11:17:29 -07:00
parent f3fdf823cf
commit 5732e47ebb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
subcmds/sync.py
View File

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