kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Change sed i\ usage to something Solaris' sed can handle 

Solaris' sed was choking on the i\ commands used in
t4015-diff-whitespace as it couldn't parse the program properly.
Modify two uses of sed that worked in GNU sed but not Solaris'
(/usr/bin or /usr/xpg4/bin) to an equivalent form that is handled
properly by both.

Signed-off-by: Ben Walton <bdwalton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ben Walton 2013-10-27 21:26:48 +00:00 committed by Junio C Hamano
parent 3d092bfc6f
commit 90a95301d3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t4015-diff-whitespace.sh
View File

@ -145,7 +145,8 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect
test_expect_success 'ignore-blank-lines: only new lines' ' test_expect_success 'ignore-blank-lines: only new lines' '
test_seq 5 >x && test_seq 5 >x &&
git update-index x && git update-index x &&
test_seq 5 | sed "/3/i \\ test_seq 5 | sed "/3/i\\
\
" >x && " >x &&
git diff --ignore-blank-lines >out && git diff --ignore-blank-lines >out &&
>expect && >expect &&
@ -155,7 +156,8 @@ test_expect_success 'ignore-blank-lines: only new lines' '
test_expect_success 'ignore-blank-lines: only new lines with space' ' test_expect_success 'ignore-blank-lines: only new lines with space' '
test_seq 5 >x && test_seq 5 >x &&
git update-index x && git update-index x &&
test_seq 5 | sed "/3/i \ " >x && test_seq 5 | sed "/3/i\\
" >x &&
git diff -w --ignore-blank-lines >out && git diff -w --ignore-blank-lines >out &&
>expect && >expect &&
test_cmp out expect test_cmp out expect