From: Simon Hausmann <hausmann@kde.org>
Date: Mon, 19 Mar 2007 11:04:37 +0000 (+0100)
Subject: Pass the right number of arguments to commit, fixes single-branch imports.
X-Git-Tag: v1.5.3-rc0~65^2^2~177
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=95d27cb75d70331cc775f37d1f3396cd01e5e238;p=git.git

Pass the right number of arguments to commit, fixes single-branch imports.

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

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index a6dbd3b98..9adb88fad 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -330,7 +330,7 @@ def commit(details, files, branch, branchPrefix, parent, merged = ""):
         action = file["action"]
 
         if file["type"] == "apple":
-            print "\nfile %s is a strange apple file that forks. Ignoring!" %s path
+            print "\nfile %s is a strange apple file that forks. Ignoring!" % path
             continue
 
         if action == "delete":
@@ -608,7 +608,7 @@ else:
                         merged = "refs/heads/" + merged
                     commit(description, files, branch, branchPrefix, parent, merged)
             else:
-                commit(description, filesForCommit, branch, globalPrefix, initialParent)
+                commit(description, files, branch, globalPrefix, initialParent)
                 initialParent = ""
         except IOError:
             print gitError.read()