# [PATCH] Change sed i\ usage to something Solaris' sed can handle 6 messages from 2013-10-27 to 2013-11-03. Participants: Ben Walton, Andreas Schwab, Junio C Hamano. Thread: https://gitlist.dev/t/35220 ## Ben Walton, 2013-10-27 21:26 Subject: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: <1382909208-7716-1-git-send-email-bdwalton@gmail.com> URL: https://gitlist.dev/e/1382909208-7716-1-git-send-email-bdwalton%40gmail.com ``` 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 --- t/t4015-diff-whitespace.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 3fb4b97..0126154 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -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_seq 5 >x && git update-index x && - test_seq 5 | sed "/3/i \\ + test_seq 5 | sed "/3/i\\ +\ " >x && git diff --ignore-blank-lines >out && >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_seq 5 >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 && >expect && test_cmp out expect -- 1.8.1.2 ``` ## Andreas Schwab, 2013-10-28 17:39 Subject: Re: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: <877gcx1eho.fsf@igel.home> URL: https://gitlist.dev/e/877gcx1eho.fsf%40igel.home In-Reply-To: <1382909208-7716-1-git-send-email-bdwalton@gmail.com> ``` Ben Walton writes: > diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh > index 3fb4b97..0126154 100755 > --- a/t/t4015-diff-whitespace.sh > +++ b/t/t4015-diff-whitespace.sh > @@ -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_seq 5 >x && > git update-index x && > - test_seq 5 | sed "/3/i \\ > + test_seq 5 | sed "/3/i\\ > +\ > " >x && Why do you need the \? Since it is inside double quotes the shell will remove it during expansion. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Ben Walton, 2013-10-28 21:10 Subject: Re: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: URL: https://gitlist.dev/e/CAP30j15%2BE4cz_kwJwaSH7-3agwC5J3jGNfaixSUg2%3D8xAzZoQg%40mail.gmail.com In-Reply-To: <877gcx1eho.fsf@igel.home> ``` On Mon, Oct 28, 2013 at 5:39 PM, Andreas Schwab wrote: > Ben Walton writes: > >> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh >> index 3fb4b97..0126154 100755 >> --- a/t/t4015-diff-whitespace.sh >> +++ b/t/t4015-diff-whitespace.sh >> @@ -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_seq 5 >x && >> git update-index x && >> - test_seq 5 | sed "/3/i \\ >> + test_seq 5 | sed "/3/i\\ >> +\ >> " >x && > > Why do you need the \? Since it is inside double quotes the shell > will remove it during expansion. It's an escape. Without it, sed throws: sed: -e expression #1, char 5: expected \ after `a', `c' or `i' Thanks -Ben -- --------------------------------------------------------------------------------------------------------------------------- Take the risk of thinking for yourself. Much more happiness, truth, beauty and wisdom will come to you that way. -Christopher Hitchens --------------------------------------------------------------------------------------------------------------------------- ``` ## Andreas Schwab, 2013-10-28 21:59 Subject: Re: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: <87y55dys2o.fsf@igel.home> URL: https://gitlist.dev/e/87y55dys2o.fsf%40igel.home In-Reply-To: ``` Ben Walton writes: > It's an escape. Without it, sed throws: The shell removes it before sed can see it. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2013-10-30 19:30 Subject: Re: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: URL: https://gitlist.dev/e/xmqqeh72blpt.fsf%40gitster.dls.corp.google.com In-Reply-To: ``` Ben Walton writes: > On Mon, Oct 28, 2013 at 5:39 PM, Andreas Schwab wrote: >> Ben Walton writes: >> >>> diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh >>> index 3fb4b97..0126154 100755 >>> --- a/t/t4015-diff-whitespace.sh >>> +++ b/t/t4015-diff-whitespace.sh >>> @@ -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_seq 5 >x && >>> git update-index x && >>> - test_seq 5 | sed "/3/i \\ >>> + test_seq 5 | sed "/3/i\\ >>> +\ >>> " >x && >> >> Why do you need the \? Since it is inside double quotes the shell >> will remove it during expansion. > > It's an escape. Without it, sed throws: > > sed: -e expression #1, char 5: expected \ after `a', `c' or `i' I think Andreas means the "feed blank line" part, i.e. >> + test_seq 5 | sed "/3/i\\ >> +\ >> " >x && should be the same as >> + test_seq 5 | sed "/3/i\\ >> " >x && because the lone \ will be eaten and will not be seen by sed. Do you see different results on Solaris between the following two? $ echo "/3/i\\ \ " | od $ echo "/3/i\\ " | od ``` ## Ben Walton, 2013-11-03 13:08 Subject: [PATCH] Change sed i\ usage to something Solaris' sed can handle Message-ID: <1383484109-30838-1-git-send-email-bdwalton@gmail.com> URL: https://gitlist.dev/e/1383484109-30838-1-git-send-email-bdwalton%40gmail.com In-Reply-To: ``` 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 --- This addresses Andreas' comment about the extraneous \. Sorry, I misunderstood the original comment. t/t4015-diff-whitespace.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index 3fb4b97..604a838 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -145,7 +145,7 @@ test_expect_success 'another test, with --ignore-space-at-eol' 'test_cmp expect test_expect_success 'ignore-blank-lines: only new lines' ' test_seq 5 >x && git update-index x && - test_seq 5 | sed "/3/i \\ + test_seq 5 | sed "/3/i\\ " >x && git diff --ignore-blank-lines >out && >expect && @@ -155,7 +155,8 @@ test_expect_success 'ignore-blank-lines: only new lines' ' test_expect_success 'ignore-blank-lines: only new lines with space' ' test_seq 5 >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 && >expect && test_cmp out expect -- 1.8.3.2 ```