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

* bw/test-fix-grep-gnuism:
  t9400: fix gnuism in grep
This commit is contained in:
Junio C Hamano 2012-05-10 10:32:15 -07:00
commit 6331da9707

View File

@ -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
'
#------------