From: Simon Hausmann <hausmann@kde.org>
Date: Sun, 1 Apr 2007 11:39:39 +0000 (+0200)
Subject: Fix "compilation" :)
X-Git-Tag: v1.5.3-rc0~65^2^2~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a9489c0249c8aef6c6ead501bae25771e710e12;p=git.git

Fix "compilation" :)

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 59c3edae1..044333735 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -416,7 +416,7 @@ class GitSync(Command):
                 optparse.make_option("--changesfile", dest="changesFile"),
                 optparse.make_option("--silent", dest="silent", action="store_true"),
                 optparse.make_option("--known-branches", dest="knownBranches"),
-                optparse.make_option("--cache", dest="doCache", action="store_true"),
+                optparse.make_option("--data-cache", dest="dataCache", action="store_true"),
                 optparse.make_option("--command-cache", dest="commandCache", action="store_true")
         ]
         self.description = """Imports from Perforce into a git repository.\n
@@ -500,7 +500,7 @@ class GitSync(Command):
             if knownBranch:
                 continue
 
-            for branch in knownBranches:
+            for branch in self.knownBranches:
                 #if relativePath.startswith(branch):
                 if self.isSubPathOf(relativePath, branch):
                     if len(branches) == 0: