diff options
| author | Simon Hausmann <shausman@trolltech.com> | 2007-06-16 13:09:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-06-16 13:09:21 +0200 |
| commit | 3c699645f589612065b048ecde45a4ea293dc75f (patch) | |
| tree | 521df67635bd8b00864782ea39008554eeb7ba22 /contrib | |
| parent | cbae7080a7fe0586255e85e1d14f1011260e8eee (diff) | |
| download | git-3c699645f589612065b048ecde45a4ea293dc75f.tar.gz git-3c699645f589612065b048ecde45a4ea293dc75f.tar.xz | |
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-x | contrib/fast-import/git-p4 | 1 |
1 files changed, 1 insertions, 0 deletions
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 |