diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2015-09-21 10:01:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-22 19:15:17 (GMT) |
| commit | 1f5f3907117021961545e42097829001b58288db (patch) | |
| tree | a40aa1d07966ba00d81a4a1c9daece2aada906b3 /t/t9825-git-p4-handle-utf16-without-bom.sh | |
| parent | fe18a0f2793b7559d5565bc65b53c7c018de3c21 (diff) | |
| download | git-1f5f3907117021961545e42097829001b58288db.zip git-1f5f3907117021961545e42097829001b58288db.tar.gz git-1f5f3907117021961545e42097829001b58288db.tar.bz2 | |
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>
Diffstat (limited to 't/t9825-git-p4-handle-utf16-without-bom.sh')
| -rwxr-xr-x | t/t9825-git-p4-handle-utf16-without-bom.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh b/t/t9825-git-p4-handle-utf16-without-bom.sh index bdd5911..1551845 100755 --- a/t/t9825-git-p4-handle-utf16-without-bom.sh +++ b/t/t9825-git-p4-handle-utf16-without-bom.sh @@ -29,7 +29,7 @@ test_expect_success 'init depot with UTF-16 encoded file and artificially remove ) ' -test_expect_failure 'clone depot with invalid UTF-16 file in verbose mode' ' +test_expect_success 'clone depot with invalid UTF-16 file in verbose mode' ' git p4 clone --dest="$git" --verbose //depot && test_when_finished cleanup_git && ( |