undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix updating/creating remotes/p4/* heads from origin/p4/*

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-06-10 10:57:40 +02:00
parent 7aded26ce8
commit cae7b732d8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/fast-import/git-p4
View File

@ -960,14 +960,16 @@ class P4Sync(Command):
print ("Creating/updating branch(es) in %s based on origin branch(es)" print ("Creating/updating branch(es) in %s based on origin branch(es)"
% self.refPrefix) % self.refPrefix)
originPrefix = "origin/p4/"
for line in read_pipe_lines("git rev-parse --symbolic --remotes"): for line in read_pipe_lines("git rev-parse --symbolic --remotes"):
line = line.strip() line = line.strip()
if (not line.startswith("origin/")) or line.endswith("HEAD"): if (not line.startswith(originPrefix)) or line.endswith("HEAD"):
continue continue
headName = line[len("origin/"):] headName = line[len(originPrefix):]
remoteHead = self.refPrefix + headName remoteHead = self.refPrefix + headName
originHead = "origin/" + headName originHead = line
original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead)) original = extractSettingsGitLog(extractLogMessageFromGitCommit(originHead))
if (not original.has_key('depot-paths') if (not original.has_key('depot-paths')
@ -1020,7 +1022,7 @@ class P4Sync(Command):
# map from branch depot path to parent branch # map from branch depot path to parent branch
self.knownBranches = {} self.knownBranches = {}
self.initialParents = {} self.initialParents = {}
self.hasOrigin = gitBranchExists("origin") self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master")
if self.importIntoRemotes: if self.importIntoRemotes:
self.refPrefix = "refs/remotes/p4/" self.refPrefix = "refs/remotes/p4/"