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 a6dbd3b98dd33ffb62031649dbd2838d450456d5..9adb88fadeed0ae1ff744294c2d8a58118b368a8 100755 (executable)
--- 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":
         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":
             continue
 
         if action == "delete":


@@ -608,7 +608,7 @@ def getUserMap():
                         merged = "refs/heads/" + merged
                     commit(description, files, branch, branchPrefix, parent, merged)
             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()
                 initialParent = ""
         except IOError:
             print gitError.read()