Re: [PATCH] Avoid problem with xpg4 grep in Solaris that broke t9400
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 19, 2012, 20:06 UTC
- Message-ID
- <xmqqlilrv63m.fsf@junio.mtv.corp.google.com>
- In-Reply-To
- <1334857109-sup-7979@pinkfloyd.chass.utoronto.ca>
Ben Walton <bwalton@artsci.utoronto.ca> writes:
> This does work and if there is some significance to the space or tab > then it's a better patch.
Ok, I'll queue this:
-- >8 -- From: Junio C Hamano <gitster@pobox.com> Subject: [PATCH] t9400: fix gnuism in grep
Using "\+" in "grep" and expecting that it means one or more is a GNUism. Spell it in a dumb and portable way.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- t/t9400-git-cvsserver-server.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 9199550..173bf3d 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -500,8 +500,8 @@ test_expect_success 'cvs status (no subdirs in header)' ' cd "$WORKDIR" test_expect_success 'cvs co -c (shows module database)' ' GIT_CONFIG="$git_config" cvs co -c > out && - grep "^master[ ]\+master$" < out && - ! grep -v "^master[ ]\+master$" < out + grep "^master[ ][ ]*master$" <out && + ! grep -v "^master[ ][ ]*master$" <out ' #------------
-- 1.7.10.282.g21208e