look for 'text' and 'binary' files.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 294c2ecfcaeb2feab7822d1f7a6d3a20416a4910..e955ad4f442d1e44cf96079f8589687ba487c26e 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -697,7 +697,8 @@ class P4Sync(Command):
             stat = filedata[j]
             j += 1
             text = ''
             stat = filedata[j]
             j += 1
             text = ''

-            while j < len(filedata) and filedata[j]['code'] == 'text':
+            while j < len(filedata) and filedata[j]['code'] in ('text',
+                                                                'binary'):

                 text += filedata[j]['data']
                 j += 1
 
                 text += filedata[j]['data']
                 j += 1
 


@@ -773,7 +774,7 @@ class P4Sync(Command):
                 if self.isWindows and file["type"].endswith("text"):
                     data = data.replace("\r\n", "\n")
 
                 if self.isWindows and file["type"].endswith("text"):
                     data = data.replace("\r\n", "\n")
 

-                self.gitStream.write("M %s inline %s\n" % (mode, relPath))
+                self.gitStream.write("M %d inline %s\n" % (mode, relPath))

                 self.gitStream.write("data %s\n" % len(data))
                 self.gitStream.write(data)
                 self.gitStream.write("\n")
                 self.gitStream.write("data %s\n" % len(data))
                 self.gitStream.write(data)
                 self.gitStream.write("\n")