From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:32:15 +0000 (-0700)
Subject: Merge branch 'bw/test-fix-grep-gnuism' into maint
X-Git-Tag: v1.7.10.2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6331da9707e45b1376cf76c9b823f0b7ee9ae9de?hp=8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8

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

* 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 9199550ef4..173bf3d4af 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
 '
 
 #------------