All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: "Lars Schneider" <larsxschneider@gmail.com>,
	"Git List" <git@vger.kernel.org>,
	"Luke Diamand" <luke@diamand.org>,
	"Torsten Bögershausen" <tboegi@web.de>
Subject: Re: [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error
Date: Mon, 21 Sep 2015 18:10:25 -0700	[thread overview]
Message-ID: <xmqqbncv6yym.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAPig+cRV-RCdcmAHG+bRL6_yYYNCRqQPQ+v3KCXwC81StGKibg@mail.gmail.com> (Eric Sunshine's message of "Mon, 21 Sep 2015 19:54:29 -0400")

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
 	)

  reply	other threads:[~2015-09-22  1:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-21 10:01 [PATCH v4 0/2] git-p4: handle "Translation of file content failed" larsxschneider
2015-09-21 10:01 ` [PATCH v4 1/2] git-p4: add test case for "Translation of file content failed" error larsxschneider
2015-09-21 18:09   ` Junio C Hamano
2015-09-21 23:03     ` Lars Schneider
2015-09-21 23:54       ` Eric Sunshine
2015-09-22  1:10         ` Junio C Hamano [this message]
2015-09-22 10:09           ` Lars Schneider
2015-09-22 16:02             ` Junio C Hamano
2015-09-22 19:11               ` Michael Blume
2015-09-22 19:17                 ` Junio C Hamano
2015-09-23  7:34                   ` Lars Schneider
2015-09-22 10:12         ` Lars Schneider
2015-09-22 16:02           ` Junio C Hamano
2015-09-21 10:01 ` [PATCH v4 2/2] git-p4: handle "Translation of file content failed" larsxschneider

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=xmqqbncv6yym.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=larsxschneider@gmail.com \
    --cc=luke@diamand.org \
    --cc=sunshine@sunshineco.com \
    --cc=tboegi@web.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.