mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 05:26:29 +02:00
Code

Use refs/heads/* instead of refs/heads/p4/* for local imports 

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-23 00:15:50 +02:00
parent 01a9c9c5a8
commit 57284050a8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,10 +760,15 @@ class P4Sync(Command):
cmdline += " --branches"
for line in mypopen(cmdline).readlines():
if line.startswith("p4/") and line != "p4/HEAD\n":
if self.importIntoRemotes and ((not line.startswith("p4/")) or line == "p4/HEAD\n"):
continue
if self.importIntoRemotes:
# strip off p4
branch = line[3:-1]
self.p4BranchesInGit.append(branch)
self.initialParents[self.refPrefix + branch] = parseRevision(line[:-1])
else:
branch = line[:-1]
self.p4BranchesInGit.append(branch)
self.initialParents[self.refPrefix + branch] = parseRevision(line[:-1])
def run(self, args):
self.depotPath = ""
@ -777,11 +782,11 @@ class P4Sync(Command):
if self.importIntoRemotes:
self.refPrefix = "refs/remotes/p4/"
else:
self.refPrefix = "refs/heads/p4/"
self.refPrefix = "refs/heads/"
createP4HeadRef = False;
if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists(self.refPrefix + "master") and not self.detectBranches:
if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists(self.refPrefix + "master") and not self.detectBranches and self.importIntoRemotes:
### needs to be ported to multi branch import
print "Syncing with origin first as requested by calling git fetch origin"