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

* bw/test-fix-grep-gnuism: t9400: fix gnuism in grep
git · May 10, 2012 · 6331da9 · 6331da9
2 parents 8cde602 + 2718781
commit 6331da9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 '
 
 #------------