@matheusbsbs / matheus-bagliano / commits / 7530a40ce2
Fork 0

look for 'text' and 'binary' files.

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

Han-Wen Nienhuys committed May 23, 2007 at 18:49 UTC 7530a40ce2006082580865f4db6d32b956ca8dc0
1 file changed +3 -2
contrib/fast-import/git-p4
+3 -2
@@ -697,7 +697,8 @@ class P4Sync(Command):
697 stat = filedata[j]
698 j += 1
699 text = ''
700 - while j < len(filedata) and filedata[j]['code'] == 'text':
700 + while j < len(filedata) and filedata[j]['code'] in ('text',
701 + 'binary'):
702 text += filedata[j]['data']
703 j += 1
704
@@ -773,7 +774,7 @@ class P4Sync(Command):
774 if self.isWindows and file["type"].endswith("text"):
775 data = data.replace("\r\n", "\n")
776
776 - self.gitStream.write("M %s inline %s\n" % (mode, relPath))
777 + self.gitStream.write("M %d inline %s\n" % (mode, relPath))
778 self.gitStream.write("data %s\n" % len(data))
779 self.gitStream.write(data)
780 self.gitStream.write("\n")