diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:32 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-08-11 04:52:32 (GMT) |
commit | 4fc4066c4acbf55801d52c1a84a88486f427ed48 (patch) | |
tree | 0c573785112c54e99eaa26037b7313d408ad58d9 | |
parent | 312d5b7429508cc339ae66e9d618b4308dd1d1e8 (diff) | |
parent | 4d35f744219335d8b32df363891b6336dcf02a6e (diff) | |
download | git-4fc4066c4acbf55801d52c1a84a88486f427ed48.zip git-4fc4066c4acbf55801d52c1a84a88486f427ed48.tar.gz git-4fc4066c4acbf55801d52c1a84a88486f427ed48.tar.bz2 |
Merge branch 'mb/p4-utf16-crlf' into maint
"git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>
* mb/p4-utf16-crlf:
git-p4: fix CR LF handling for utf16 files
-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": |