kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Fix conversion from old style heads/p4 to remotes/p4/master 

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 2007-05-21 08:44:16 +02:00
parent 341dc1c179
commit 33be3e6550
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -730,11 +730,6 @@ class P4Sync(Command):
self.knownBranches = {} self.knownBranches = {}
self.initialParents = {} self.initialParents = {}


self.listExistingP4GitBranches()
if len(self.p4BranchesInGit) > 1 and not self.silent:
print "Importing from/into multiple branches"
self.detectBranches = True

if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches: if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
### needs to be ported to multi branch import ### needs to be ported to multi branch import


@ -760,6 +755,12 @@ class P4Sync(Command):
if not gitBranchExists("refs/remotes/p4/HEAD"): if not gitBranchExists("refs/remotes/p4/HEAD"):
system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch) system("git symbolic-ref refs/remotes/p4/HEAD %s" % self.branch)


# this needs to be called after the conversion from heads/p4 to remotes/p4/master
self.listExistingP4GitBranches()
if len(self.p4BranchesInGit) > 1 and not self.silent:
print "Importing from/into multiple branches"
self.detectBranches = True

if len(args) == 0: if len(args) == 0:
if not gitBranchExists(self.branch) and gitBranchExists("origin") and not self.detectBranches: if not gitBranchExists(self.branch) and gitBranchExists("origin") and not self.detectBranches:
### needs to be ported to multi branch import ### needs to be ported to multi branch import