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

> Brian Charles Gernhardt <gernh...@cs.rochester.edu> writes:
>
>> Another problem caused by BSD v GNU sed, I think.
>
> Oh, that again X-<.
>
> Will patch up in a stupid-but-trivial way, unless somebody knows a
> reliable workaround.

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 <gits...@pobox.com>
---
 t/t4055-diff-context.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/t/t4055-diff-context.sh b/t/t4055-diff-context.sh
index 3527686..97172b4 100755
--- a/t/t4055-diff-context.sh
+++ b/t/t4055-diff-context.sh
@@ -8,7 +8,7 @@ test_description='diff.context configuration'
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-       cat >x <<-\EOF &&
+       cat >template <<-\EOF &&
        firstline
        b
        c
@@ -16,6 +16,7 @@ test_expect_success 'setup' '
        e
        f
        preline
+       TARGET
        postline
        i
        j
@@ -24,17 +25,15 @@ test_expect_success 'setup' '
        m
        n
        EOF
+       sed "/TARGET/d" >x <template &&
        git update-index --add x &&
        git commit -m initial &&
 
-       git cat-file blob HEAD:x |
-       sed "/preline/a\
-       ADDED" >x &&
+       sed "s/TARGET/ADDED/" >x <template &&
        git update-index --add x &&
        git commit -m next &&
 
-       git cat-file blob HEAD:x |
-       sed s/ADDED/MODIFIED/ >x
+       sed "s/TARGET/MODIFIED/" >x <template
 '
 
 test_expect_success 'the default number of context lines is 3' '
-- 
1.8.0.rc0.45.g7ce8dc5

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to