git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, luke@diamand.org,
	Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v2 1/2] git-p4: add test case for "Translation of file content failed" error
Date: Mon, 14 Sep 2015 18:55:27 +0200	[thread overview]
Message-ID: <1442249728-89494-2-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1442249728-89494-1-git-send-email-larsxschneider@gmail.com>

From: Lars Schneider <larsxschneider@gmail.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.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
 t/t9824-git-p4-handle-utf16-without-bom.sh | 47 ++++++++++++++++++++++++++++++
 1 file changed, 47 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..fa8043b
--- /dev/null
+++ b/t/t9824-git-p4-handle-utf16-without-bom.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='git p4 handle UTF-16 without BOM'
+
+. ./lib-git-p4.sh
+
+UTF16="\\x97\\x0\\x97\\x0"
+
+test_expect_success 'start p4d' '
+	start_p4d
+'
+
+test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' '
+	(
+		cd "$cli" &&
+		echo "file1 -text" > .gitattributes &&
+		perl -e "printf \"$UTF16\"" >file1 &&
+		p4 add -t utf16 file1 &&
+
+		p4 add .gitattributes &&
+		p4 submit -d "file1"
+	) &&
+
+	(
+		cd "db" &&
+		p4d -jc &&
+		# P4D automatically adds a BOM. Remove it here to make the file invalid.
+		perl -i -ne "print unless eof" depot/file1,v &&
+		perl -e "printf \"@$UTF16@\"" >> depot/file1,v &&
+		p4d -jrF checkpoint.1
+	)
+'
+
+test_expect_success 'clone depot with invalid UTF-16 file' '
+	git p4 clone --dest="$git" --verbose //depot &&
+	(
+		cd "$git" &&
+		perl -e "printf \"$UTF16\"" > expect &&
+		test_cmp_bin expect file1
+	)
+'
+
+test_expect_success 'kill p4d' '
+	kill_p4d
+'
+
+test_done
-- 
2.5.1

  reply	other threads:[~2015-09-14 16:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-14 16:55 [PATCH v2 0/2] git-p4: handle "Translation of file content failed" larsxschneider
2015-09-14 16:55 ` larsxschneider [this message]
2015-09-15  4:40   ` [PATCH v2 1/2] git-p4: add test case for "Translation of file content failed" error Torsten Bögershausen
2015-09-15 14:49     ` Lars Schneider
2015-09-14 16:55 ` [PATCH v2 2/2] git-p4: handle "Translation of file content failed" larsxschneider
2015-09-15  6:43   ` Luke Diamand
2015-09-15 15:38     ` Lars Schneider
2015-09-15 22:12       ` Luke Diamand
2015-09-16 11:38         ` Lars Schneider

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1442249728-89494-2-git-send-email-larsxschneider@gmail.com \
    --to=larsxschneider@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=luke@diamand.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).