Skip to content

Commit e22a81c

Browse files
committed
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
2 parents 8ea0780 + 2718781 commit e22a81c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t9400-git-cvsserver-server.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ test_expect_success 'cvs status (no subdirs in header)' '
500500
cd "$WORKDIR"
501501
test_expect_success 'cvs co -c (shows module database)' '
502502
GIT_CONFIG="$git_config" cvs co -c > out &&
503-
grep "^master[ ]\+master$" < out &&
504-
! grep -v "^master[ ]\+master$" < out
503+
grep "^master[ ][ ]*master$" <out &&
504+
! grep -v "^master[ ][ ]*master$" <out
505505
'
506506

507507
#------------

0 commit comments

Comments
 (0)