From: Simon Hausmann <shausman@trolltech.com>
Date: Sat, 16 Jun 2007 11:09:21 +0000 (+0200)
Subject: Fix initial multi-branch import.
X-Git-Tag: v1.5.3-rc0~65^2^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c699645f589612065b048ecde45a4ea293dc75f;p=git.git

Fix initial multi-branch import.

The list of existing p4 branches in git wasn't initialized.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index b3f27fe90..e527734be 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -637,6 +637,7 @@ class P4Sync(Command):
         self.isWindows = (platform.system() == "Windows")
         self.keepRepoPath = False
         self.depotPaths = None
+        self.p4BranchesInGit = []
 
         if gitConfig("git-p4.syncFromOrigin") == "false":
             self.syncWithOrigin = False