mirror of
https://github.com/git/git.git
synced 2024-05-27 00:36:37 +02:00
1f5f390711
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>
51 lines
1.0 KiB
Bash
Executable File
51 lines
1.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 handling of UTF-16 files without BOM'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
UTF16="\227\000\227\000"
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' '
|
|
(
|
|
cd "$cli" &&
|
|
printf "$UTF16" >file1 &&
|
|
p4 add -t utf16 file1 &&
|
|
p4 submit -d "file1"
|
|
) &&
|
|
|
|
(
|
|
cd db &&
|
|
p4d -jc &&
|
|
# P4D automatically adds a BOM. Remove it here to make the file invalid.
|
|
sed -e "\$d" depot/file1,v >depot/file1,v.new &&
|
|
mv depot/file1,v.new depot/file1,v &&
|
|
printf "@$UTF16@" >>depot/file1,v &&
|
|
p4d -jrF checkpoint.1
|
|
)
|
|
'
|
|
|
|
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 &&
|
|
(
|
|
cd "$git" &&
|
|
printf "$UTF16" >expect &&
|
|
test_cmp_bin expect file1
|
|
)
|
|
'
|
|
|
|
test_expect_failure 'clone depot with invalid UTF-16 file in non-verbose mode' '
|
|
git p4 clone --dest="$git" //depot
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|