summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Hausmann <shausman@trolltech.com>2007-06-16 11:09:21 (GMT)
committerSimon Hausmann <shausman@trolltech.com>2007-06-16 11:09:21 (GMT)
commit3c699645f589612065b048ecde45a4ea293dc75f (patch)
tree521df67635bd8b00864782ea39008554eeb7ba22 /contrib
parentcbae7080a7fe0586255e85e1d14f1011260e8eee (diff)
downloadgit-3c699645f589612065b048ecde45a4ea293dc75f.zip
git-3c699645f589612065b048ecde45a4ea293dc75f.tar.gz
git-3c699645f589612065b048ecde45a4ea293dc75f.tar.bz2
Fix initial multi-branch import.
The list of existing p4 branches in git wasn't initialized. Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p41
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index b3f27fe..e527734 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