t4055 failure: see error

Another problem caused by BSD v GNU sed, I think.

$ ./t4055-diff-context.sh -i -v
Initialized empty Git repository in /Users/brian/dev/git/t/trash directory.t4055-diff-context/.git/
expecting success: 
	cat >x <<-\EOF &&
	firstline
	b
	c
	d
	e
	f
	preline
	postline
	i
	j
	k
	l
	m
	n
	EOF
	git update-index --add x &&
	git commit -m initial &&

	git cat-file blob HEAD:x |
	sed "/preline/a\
	ADDED" >x &&
	git update-index --add x &&
	git commit -m next &&

	git cat-file blob HEAD:x |
	sed s/ADDED/MODIFIED/ >x

[master (root-commit) d5fa2e5] initial
 Author: A U Thor <author@example.com>
 1 file changed, 14 insertions(+)
 create mode 100644 x
sed: 1: "/preline/a	ADDED": command a expects \ followed by text

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

Oh, that again X-<.

Will patch up in a stupid-but-trivial way, unless somebody knows a reliable workaround.

Thanks.

Junio C Hamano <gitster@pobox.com> writes:

I no longer have a BSD handy to test, so I'd appreciate it if somebody can do a quick sanity check.

Thanks.

-- >8 --
Subject: [PATCH] t4055: avoid BSD/GNU sed incompatibilty issues

The 'a', 'i' and 'c' commands that take literal lines to be added followed by backslash does not seem to work reliably on some BSD systems. Avoid it by having an extra line in a template file and generate test vectors by deleting the line or replacing the line.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t4055-diff-context.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

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(-)

Junio C Hamano <gitster@pobox.com> writes:

I'll find a brown paper bag big enough to hide in. Please disregard it.

-- >8 --
Subject: [PATCH] t4055: avoid use of sed 'a' command

The 'a', 'i' and 'c' commands take a literal text to be added followed by backslash, but then in the source we cannot indent the literal text which makes it ugly.

We need to also remember to double the backslash inside double quotes.

Avoid these issues altogether by having an extra line in a template file and generate test vectors by deleting the line or replacing the line and not using the 'a' command.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t4055-diff-context.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

On Oct 2, 2012, at 3:09 PM, Junio C Hamano <gitster@pobox.com> wrote:

Sorry about being slow to respond.  The patch does work for me.  I see it's already been committed, but thought the confirmation would be nice.

~~ Brian Gernhardt

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

Thanks.