diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 09:16:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 09:16:55 -0700 |
commit | 745af8c7b5506f17516e21629386191acb26aae7 (patch) | |
tree | 4cc641f92759263a97e2fe83ea40c0ed60a13c55 /git-p4.py | |
parent | 04e340b29bc51d8b220a1fe3b4a145fbd222cc6d (diff) | |
parent | 4d35f744219335d8b32df363891b6336dcf02a6e (diff) | |
download | git-745af8c7b5506f17516e21629386191acb26aae7.tar.gz |
Merge branch 'mb/p4-utf16-crlf'
"git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
* mb/p4-utf16-crlf:
git-p4: fix CR LF handling for utf16 files
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3148,7 +3148,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": |