On 21 Sep 2015, at 09:49, Luke Diamand <l...@diamand.org> wrote: > On 20/09/15 17:22, larsxschnei...@gmail.com wrote: >> From: Lars Schneider <larsxschnei...@gmail.com> > > When I run this, I get errors reported on the sed usage: > > t9824-git-p4-handle-utf16-without-bom.sh:25: error: sed -i is not portable: > sed -i.bak "$ d" depot/file1,v && > t9824-git-p4-handle-utf16-without-bom.sh:25: error: sed -i is not portable: > sed -i.bak "$ d" depot/file1,v &&
I tried it on OS X 10.9.5 and on Ubuntu Linux 14.04.1 (sed version 4.2.2). The “-i” option is mentioned in the GNU sed docs here: https://www.gnu.org/software/sed/manual/sed.html The OS X sed man page indeed lists “-i” as non-standard option: https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/sed.1.html What OS/sed version are you using? Thanks, Lars > > > Luke > > >> >> 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 >> >> Signed-off-by: Lars Schneider <larsxschnei...@gmail.com> >> --- >> t/t9824-git-p4-handle-utf16-without-bom.sh | 49 >> ++++++++++++++++++++++++++++++ >> 1 file changed, 49 insertions(+) >> create mode 100755 t/t9824-git-p4-handle-utf16-without-bom.sh >> >> diff --git a/t/t9824-git-p4-handle-utf16-without-bom.sh >> b/t/t9824-git-p4-handle-utf16-without-bom.sh >> new file mode 100755 >> index 0000000..517f6da >> --- /dev/null >> +++ b/t/t9824-git-p4-handle-utf16-without-bom.sh >> @@ -0,0 +1,49 @@ >> +#!/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 -i.bak "$ d" depot/file1,v && > > This line is the problem I think. > > >> + 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
