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

From

Junio C Hamano <gitster@pobox.com>

Date

Sep 22, 2015, 01:10 UTC

Message-ID

<xmqqbncv6yym.fsf@gitster.mtv.corp.google.com>

In-Reply-To

<CAPig+cRV-RCdcmAHG+bRL6_yYYNCRqQPQ+v3KCXwC81StGKibg@mail.gmail.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

> Yes, it's because $d is a variable reference, even within double
> quotes.

s/even/especially/ ;-)

Here is what I queued as SQUASH???

diff --git a/t/t9825-git-p4-handle-utf16-without-bom.sh b/t/t9825-git-p4-handle-utf16-without-bom.sh
index 65c3c4e..735c0bb 100644
--- a/t/t9825-git-p4-handle-utf16-without-bom.sh
+++ b/t/t9825-git-p4-handle-utf16-without-bom.sh
@@ -22,8 +22,8 @@ test_expect_success 'init depot with UTF-16 encoded file and artificially remove
 		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 &&
+		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
 	)