Merge branch 'master' of git://repo.or.cz/fast-export

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 36fe69a79540029a83f4e31a5b980523e49b96d1..28e37fa6ab489fec66006716ab7b9249a64789cd 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -718,6 +718,11 @@ class P4Sync(Command):
                 text += filedata[j]['data']
                 j += 1
 
+
+            if not stat.has_key('depotFile'):
+                sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
+                continue
+
             contents[stat['depotFile']] = text
 
         for f in files: