Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Luke Diamand
On 20/09/15 23:29, Eric Sunshine wrote: On Sun, Sep 20, 2015 at 5:34 PM, Lars Schneider wrote: What is the preferred way by the Git community? Combine patch and test in one commit or a patch commit followed by a test commit? I would prefer to have everything in one

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Luke Diamand
On 20/09/15 17:22, larsxschnei...@gmail.com wrote: From: Lars Schneider 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 &&

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Junio C Hamano
Lars Schneider writes: > What OS/sed version are you using? You should go with POSIX.1 http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Junio C Hamano
Lars Schneider writes: > On 20 Sep 2015, at 23:16, Eric Sunshine wrote: > >> On Sun, Sep 20, 2015 at 12:22 PM, wrote: >>> A P4 repository can get into a state where it contains a file with >>> type UTF-16 that does

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Lars Schneider
On 21 Sep 2015, at 09:49, Luke Diamand wrote: > On 20/09/15 17:22, larsxschnei...@gmail.com wrote: >> From: Lars Schneider > > When I run this, I get errors reported on the sed usage: > > t9824-git-p4-handle-utf16-without-bom.sh:25: error: sed -i

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-21 Thread Torsten Bögershausen
On 09/21/2015 11:05 AM, Lars Schneider wrote: 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:

[PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-20 Thread larsxschneider
From: Lars Schneider 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

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-20 Thread Eric Sunshine
On Sun, Sep 20, 2015 at 12:22 PM, wrote: > 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

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-20 Thread Lars Schneider
On 20 Sep 2015, at 23:16, Eric Sunshine wrote: > On Sun, Sep 20, 2015 at 12:22 PM, wrote: >> 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

Re: [PATCH v3 1/2] git-p4: add test case for "Translation of file content failed" error

2015-09-20 Thread Eric Sunshine
On Sun, Sep 20, 2015 at 5:34 PM, Lars Schneider wrote: > On 20 Sep 2015, at 23:16, Eric Sunshine wrote: >> On Sun, Sep 20, 2015 at 12:22 PM, wrote: >>> A P4 repository can get into a state where it contains a file