diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-23 13:02:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-23 13:02:15 -0700 |
| commit | e22a81ca54448fb49847ff72be0a8859bcc015ae (patch) | |
| tree | 3f3f63ce6d400fa026741cdae51416a666e4ccdb /t | |
| parent | Merge branch 'rj/submodule-mswin-path' (diff) | |
| parent | t9400: fix gnuism in grep (diff) | |
| download | tgif-e22a81ca54448fb49847ff72be0a8859bcc015ae.tar.xz | |
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')
| -rwxr-xr-x | t/t9400-git-cvsserver-server.sh | 4 |
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 ' #------------ |