summaryrefslogtreecommitdiff
path: root/t/t9400-git-cvsserver-server.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-23 13:02:15 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-23 13:02:15 -0700
commite22a81ca54448fb49847ff72be0a8859bcc015ae (patch)
tree3f3f63ce6d400fa026741cdae51416a666e4ccdb /t/t9400-git-cvsserver-server.sh
parent8ea07808c1eaae9f819c37dd65affe674564627e (diff)
parent27187817e4527696e513afcbec7e0503a89ec93a (diff)
downloadgit-e22a81ca54448fb49847ff72be0a8859bcc015ae.tar.gz
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
Diffstat (limited to 't/t9400-git-cvsserver-server.sh')
-rwxr-xr-xt/t9400-git-cvsserver-server.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index d3e88f8dd6..806623e885 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
'
#------------