Skip to content

Commit

Permalink
Merge branch 'bw/test-fix-grep-gnuism'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Apr 23, 2012
2 parents 8ea0780 + 2718781 commit e22a81c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t9400-git-cvsserver-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

#------------
Expand Down

0 comments on commit e22a81c

Please sign in to comment.