Commit 4d35f74
git-p4: fix CR LF handling for utf16 files
Perforce silently replaces LF with CR LF for "utf16" files if the client
is a native Windows client. Since git's autocrlf logic does not undo
this transformation for UTF-16 encoded files, git-p4 replaces CR LF with
LF during the sync if the file type "utf16" is detected and the Perforce
client platform indicates that this conversion is performed.
Windows only runs on little-endian architectures, therefore the encoding
of the byte stream received from the Perforce client is UTF-16-LE and
the relevant byte sequence is 0D 00 0A 00.
Signed-off-by: Moritz Baumann <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>1 parent bbea4dc commit 4d35f74
1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3148 | 3148 | | |
3149 | 3149 | | |
3150 | 3150 | | |
3151 | | - | |
| 3151 | + | |
3152 | 3152 | | |
3153 | 3153 | | |
3154 | 3154 | | |
| |||
0 commit comments