# [PATCH] Fix sed syntax in t7502-commit for OSX 7 messages from 2008-05-15 to 2008-05-16. Participants: Marcel Koeppen, Junio C Hamano, Holger Schurig, Santi Béjar, Jeff King. Thread: https://gitlist.dev/t/13524 ## Marcel Koeppen, 2008-05-15 02:19 Subject: [PATCH] Fix sed syntax in t7502-commit for OSX Message-ID: <1210817948-72280-1-git-send-email-git-dev@marzelpan.de> URL: https://gitlist.dev/e/1210817948-72280-1-git-send-email-git-dev%40marzelpan.de ``` The OSX version of sed interprets the command as argument to the -i option. Signed-off-by: Marcel Koeppen --- t/t7502-commit.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 018060c..9a43104 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -166,7 +166,7 @@ test_expect_success 'author different from committer' ' test_cmp expect actual ' -sed -i '$d' expect +sed -i -e '$d' expect echo "# Committer: #" >> expect unset GIT_COMMITTER_EMAIL -- 1.5.5.1.215.g64c0d ``` ## Junio C Hamano, 2008-05-15 08:37 Subject: Re: [PATCH] Fix sed syntax in t7502-commit for OSX Message-ID: <7vwslwgdyi.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vwslwgdyi.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1210817948-72280-1-git-send-email-git-dev@marzelpan.de> ``` Marcel Koeppen writes: > The OSX version of sed interprets the command as argument to the -i option. > > Signed-off-by: Marcel Koeppen > --- > t/t7502-commit.sh | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh > index 018060c..9a43104 100755 > --- a/t/t7502-commit.sh > +++ b/t/t7502-commit.sh > @@ -166,7 +166,7 @@ test_expect_success 'author different from committer' ' > test_cmp expect actual > ' > > -sed -i '$d' expect > +sed -i -e '$d' expect > echo "# Committer: > #" >> expect > unset GIT_COMMITTER_EMAIL Two comments and a half. This patch does not make things worse, so I do not have much against it. However, "sed -i $cmd" is also used in templates/hooks--prepare-commit-msg and you would want to fix it as well. But more importantly, as we are serious about portability, we should not be using "sed -i" which is not even in POSIX to begin with. Can we rewrite these places without using the in-place extension? ``` ## Holger Schurig, 2008-05-15 08:58 Subject: Re: [PATCH] Fix sed syntax in t7502-commit for OSX Message-ID: <200805151058.34774.hs4233@mail.mn-solutions.de> URL: https://gitlist.dev/e/200805151058.34774.hs4233%40mail.mn-solutions.de In-Reply-To: <7vwslwgdyi.fsf@gitster.siamese.dyndns.org> ``` > > -sed -i '$d' expect > > +sed -i -e '$d' expect perl -pi -e 's/foo/bar/' ??? GIT already needs perl, so we can re-use it's features savely. ``` ## Santi Béjar, 2008-05-15 09:37 Subject: Re: [PATCH] Fix sed syntax in t7502-commit for OSX Message-ID: <8aa486160805150237t734b24dcw4a153e41cbc7436e@mail.gmail.com> URL: https://gitlist.dev/e/8aa486160805150237t734b24dcw4a153e41cbc7436e%40mail.gmail.com In-Reply-To: <7vwslwgdyi.fsf@gitster.siamese.dyndns.org> ``` On Thu, May 15, 2008 at 10:37 AM, Junio C Hamano wrote: > > But more importantly, as we are serious about portability, we should not > be using "sed -i" which is not even in POSIX to begin with. Is there a way (environment variable, flag) to test if it is POSIX? Or we just have to know? I'll send a patch to document the "sed -i" issue in Documentation/CodingGuidelines. > Can we > rewrite these places without using the in-place extension? Yes, I'll do it soon if nobody beats me. Santi ``` ## Marcel Koeppen, 2008-05-15 11:06 Subject: Re: [PATCH] Fix sed syntax in t7502-commit for OSX Message-ID: <22590A7D-0409-4940-BC2E-776B2189BFEC@marzelpan.de> URL: https://gitlist.dev/e/22590A7D-0409-4940-BC2E-776B2189BFEC%40marzelpan.de In-Reply-To: <200805151058.34774.hs4233@mail.mn-solutions.de> ``` Am 15.05.2008 um 10:58 schrieb Holger Schurig: >>> -sed -i '$d' expect >>> +sed -i -e '$d' expect > > perl -pi -e 's/foo/bar/' ??? This does not work with '$d', so we could use sed with a temp instead of the -i extension. Alternatively we could specify the full test fixture instead of editing an old one. This would make the expected results more obvious and the tests would work without assumptions about running order. Marcel ``` ## Marcel Koeppen, 2008-05-16 00:21 Subject: [PATCH] Replace in-place sed in t7502-commit Message-ID: <1210897303-80828-1-git-send-email-git-dev@marzelpan.de> URL: https://gitlist.dev/e/1210897303-80828-1-git-send-email-git-dev%40marzelpan.de In-Reply-To: <7vwslwgdyi.fsf@gitster.siamese.dyndns.org> ``` The in-place mode of sed used in t7502-commit is a non-POSIX extension. That call of sed is replaced by a more portable version using a temporary file. Signed-off-by: Marcel Koeppen --- t/t7502-commit.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 018060c..3531a99 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -166,7 +166,9 @@ test_expect_success 'author different from committer' ' test_cmp expect actual ' -sed -i '$d' expect +mv expect expect.tmp +sed '$d' < expect.tmp > expect +rm -f expect.tmp echo "# Committer: #" >> expect unset GIT_COMMITTER_EMAIL -- 1.5.5.1.215.g64c0d ``` ## Jeff King, 2008-05-16 09:56 Subject: Re: [PATCH] Replace in-place sed in t7502-commit Message-ID: <20080516095606.GA25045@sigill.intra.peff.net> URL: https://gitlist.dev/e/20080516095606.GA25045%40sigill.intra.peff.net In-Reply-To: <1210897303-80828-1-git-send-email-git-dev@marzelpan.de> ``` On Fri, May 16, 2008 at 02:21:43AM +0200, Marcel Koeppen wrote: > The in-place mode of sed used in t7502-commit is a non-POSIX extension. > That call of sed is replaced by a more portable version using a > temporary file. Thanks, this fixes a similar issue on FreeBSD (which is probably the same sed). -Peff ```