Provide a little bit of help description for the git-p4 "tools".

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 6f7bbb0f329ba58faffcae938414435c9f14e3f9..9adb88fadeed0ae1ff744294c2d8a58118b368a8 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -329,6 +329,10 @@ def commit(details, files, branch, branchPrefix, parent, merged = ""):
         relPath = path[len(branchPrefix):]
         action = file["action"]
 
+        if file["type"] == "apple":
+            print "\nfile %s is a strange apple file that forks. Ignoring!" % path
+            continue
+
         if action == "delete":
             gitStream.write("D %s\n" % relPath)
         else:
@@ -604,7 +608,7 @@ def getUserMap():
                         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()