Merge branch 'bw/test-fix-grep-gnuism' into maint

* bw/test-fix-grep-gnuism: t9400: fix gnuism in grep

Merge branch 'bw/test-fix-grep-gnuism' into maint
* bw/test-fix-grep-gnuism: t9400: fix gnuism in grep
6331da97 · Junio C Hamano · 8cde6021 · 27187817 · 6331da97
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

t/t9400-git-cvsserver-server.sh t/t9400-git-cvsserver-server.sh +2 -2

未找到文件。
--- 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
 '

 #------------