@matheusbsbs / matheus-bagliano / commits / 8a5fc95b43
Fork 0

Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found.

Specifying --detect-branches is now only needed for the initial clone/sync. Afterwards it's turned on implicitly if more p4 branches than remotes/p4/master are found. Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Simon Hausmann committed May 20, 2007 at 23:39 UTC 8a5fc95b43ab25e7ce0ca14cf733669e5708b448
1 file changed +3
contrib/fast-import/git-p4
+3
@@ -719,6 +719,9 @@ class P4Sync(Command):
719 self.initialParents = {}
720
721 self.listExistingP4GitBranches()
722 + if len(self.p4BranchesInGit) > 1:
723 + print "Importing from/into multiple branches"
724 + self.detectBranches = True
725
726 if self.syncWithOrigin and gitBranchExists("origin") and gitBranchExists("refs/remotes/p4/master") and not self.detectBranches:
727 ### needs to be ported to multi branch import