Merge branch 'kk/p4-client-name-encoding-fix' into maint

[thirdparty/git.git] / git-p4.py

diff --git a/git-p4.py b/git-p4.py
index 9323b943c68493f88ed59948a6031a659d8bef55..77dc19daa61de1e7eb850292f3fd6a963b580130 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -3181,7 +3181,7 @@ class P4Sync(Command, P4UserMap):
                     raise e
             else:
                 if p4_version_string().find('/NT') >= 0:
-                    text = text.replace(b'\r\n', b'\n')
+                    text = text.replace(b'\x0d\x00\x0a\x00', b'\x0a\x00')
                 contents = [text]
 
         if type_base == "apple":