From: Simon Hausmann <shausman@trolltech.com>
Date: Sun, 20 May 2007 21:39:40 +0000 (+0200)
Subject: Specifying --detect-branches is now only needed for the initial clone/sync.
X-Git-Tag: v1.5.3-rc0~65^2^2~86
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a5fc95b43ab25e7ce0ca14cf733669e5708b448;p=git.git

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>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index bcea4cf3d..d4bf67333 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -719,6 +719,9 @@ class P4Sync(Command):
         self.initialParents = {}
 
         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:
             ### needs to be ported to multi branch import