| commit | 1f5f3907117021961545e42097829001b58288db | |
| author | Lars Schneider <larsxschneider@gmail.com> | |
| Mon, 21 Sep 2015 10:01:41 +0000 (21 12:01 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Sep 2015 19:15:17 +0000 (22 12:15 -0700) | ||
| tree | a40aa1d07966ba00d81a4a1c9daece2aada906b3 | treesnapshot (tar.gz zip) |
| parent | fe18a0f2793b7559d5565bc65b53c7c018de3c21 | commitdiff |
git-p4: handle "Translation of file content failed"
A P4 repository can get into a state where it contains a file with
type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4
attempts to retrieve the file then the process crashes with a
"Translation of file content failed" error.
More info here: http://answers.perforce.com/articles/KB/3117
Fix this by detecting this error and retrieving the file as binary
instead. The result in Git is the same.
Known issue: This works only if git-p4 is executed in verbose mode.
In normal mode no exceptions are thrown and git-p4 just exits.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A P4 repository can get into a state where it contains a file with
type UTF-16 that does not contain a valid UTF-16 BOM. If git-p4
attempts to retrieve the file then the process crashes with a
"Translation of file content failed" error.
More info here: http://answers.perforce.com/articles/KB/3117
Fix this by detecting this error and retrieving the file as binary
instead. The result in Git is the same.
Known issue: This works only if git-p4 is executed in verbose mode.
In normal mode no exceptions are thrown and git-p4 just exits.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-p4.py | diffblobblamehistory | |
| t/t9825-git-p4-handle-utf16-without-bom.sh | diffblobblamehistory |