From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 20:02:15 +0000 (-0700)
Subject: Merge branch 'bw/test-fix-grep-gnuism'
X-Git-Tag: v1.7.11-rc0~116
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e22a81ca54448fb49847ff72be0a8859bcc015ae?hp=8ea07808c1eaae9f819c37dd65affe674564627e

Merge branch 'bw/test-fix-grep-gnuism'

Fix two places that were the only place in the test suite that gave "a\+"
to platform grep and expected it to mean one or more "a", which is a
blatant GNUism.

* bw/test-fix-grep-gnuism:
t9400: fix gnuism in grep
---

diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index d3e88f8dd6..806623e885 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
 '
 
 #------------