diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:32:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 10:32:15 -0700 |
| commit | 6331da9707e45b1376cf76c9b823f0b7ee9ae9de (patch) | |
| tree | 9469c8e5f1076de1f34c3f34d2e04bfa088c2476 | |
| parent | 8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8 (diff) | |
| parent | 27187817e4527696e513afcbec7e0503a89ec93a (diff) | |
| download | git-6331da9707e45b1376cf76c9b823f0b7ee9ae9de.tar.gz git-6331da9707e45b1376cf76c9b823f0b7ee9ae9de.tar.xz | |
Merge branch 'bw/test-fix-grep-gnuism' into maint
* bw/test-fix-grep-gnuism:
t9400: fix gnuism in grep
| -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 9199550ef..173bf3d4a 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 ' #------------ |