undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mb/p4-utf16-crlf' into maint

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2022-08-10 21:52:32 -07:00
commit 4fc4066c4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -3148,7 +3148,7 @@ class P4Sync(Command, P4UserMap):
raise e raise e
else: else:
if p4_version_string().find('/NT') >= 0: 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] contents = [text]
if type_base == "apple": if type_base == "apple":