diff options
| author | Simon Hausmann <shausman@trolltech.com> | 2007-05-20 23:39:40 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-20 23:39:40 +0200 |
| commit | 8a5fc95b43ab25e7ce0ca14cf733669e5708b448 (patch) | |
| tree | 9542f081ca0d6a0b1ce3a3804dff0493b4f8f266 /contrib | |
| parent | c1b296b9f19a62aa9e444cc454b3d62ffaa98da4 (diff) | |
| download | git-8a5fc95b43ab25e7ce0ca14cf733669e5708b448.tar.gz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index bcea4cf3de..d4bf67333f 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 |