@matheusbsbs / matheus-bagliano / commits / 95d27cb75d
Fork 0

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

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

Simon Hausmann committed Mar 19, 2007 at 12:04 UTC 95d27cb75d70331cc775f37d1f3396cd01e5e238
1 file changed +2 -2
contrib/fast-import/p4-fast-export.py
+2 -2
@@ -330,7 +330,7 @@ def commit(details, files, branch, branchPrefix, parent, merged = ""):
330 action = file["action"]
331
332 if file["type"] == "apple":
333 - print "\nfile %s is a strange apple file that forks. Ignoring!" %s path
333 + print "\nfile %s is a strange apple file that forks. Ignoring!" % path
334 continue
335
336 if action == "delete":
@@ -608,7 +608,7 @@ else:
608 merged = "refs/heads/" + merged
609 commit(description, files, branch, branchPrefix, parent, merged)
610 else:
611 - commit(description, filesForCommit, branch, globalPrefix, initialParent)
611 + commit(description, files, branch, globalPrefix, initialParent)
612 initialParent = ""
613 except IOError:
614 print gitError.read()