git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Brian Charles Gernhardt <gernhard@cs.rochester.edu>
Cc: Git List <git@vger.kernel.org>
Subject: Re: t4055 failure: see error
Date: Tue, 02 Oct 2012 12:00:40 -0700	[thread overview]
Message-ID: <7vy5jo7l7r.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7667682A-3BDB-484F-A3E4-0E5826FD2076@cs.rochester.edu> (Brian Charles Gernhardt's message of "Tue, 2 Oct 2012 08:18:22 -0400")

Brian Charles Gernhardt <gernhard@cs.rochester.edu> writes:

> Another problem caused by BSD v GNU sed, I think.
>
> 	git cat-file blob HEAD:x |
> 	sed "/preline/a\
> 	ADDED" >x &&

Actually, I think what is happening is that inside "", the backslash
at the end of line is eaten by the shell together with that end of
line, so it is not BSD vs GNU, but it simply is that my quoting was
wrong.

This (disregarding the previous "TARGET" patch) may be a smaller fix.

 t/t4055-diff-context.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git c/t/t4055-diff-context.sh w/t/t4055-diff-context.sh
index 3527686..0f2dd40 100755
--- c/t/t4055-diff-context.sh
+++ w/t/t4055-diff-context.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 	git commit -m initial &&
 
 	git cat-file blob HEAD:x |
-	sed "/preline/a\
+	sed "/preline/a\\
 	ADDED" >x &&
 	git update-index --add x &&
 	git commit -m next &&

  parent reply	other threads:[~2012-10-02 19:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-02 12:18 t4055 failure: see error Brian Charles Gernhardt
2012-10-02 18:45 ` Junio C Hamano
2012-10-02 18:52   ` Junio C Hamano
2012-10-02 19:00 ` Junio C Hamano [this message]
2012-10-02 19:09   ` Junio C Hamano
2012-10-07 15:43     ` Brian Charles Gernhardt
2012-10-07 22:37       ` Junio C Hamano

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=7vy5jo7l7r.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=gernhard@cs.rochester.edu \
    --cc=git@vger.kernel.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).