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

Specifying --detect-branches is now only needed for the initial clone/sync.

Browse Source 
Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master
are found.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-20 23:39:40 +02:00
parent c1b296b9f1
commit 8a5fc95b43
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -719,6 +719,9 @@ class P4Sync(Command):
self.initialParents = {} self.initialParents = {}
self.listExistingP4GitBranches() self.listExistingP4GitBranches()
if len(self.p4BranchesInGit) > 1:
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