Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bw/test-fix-grep-gnuism'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 23 Apr 2012 20:02:15 +0000
(13:02 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 23 Apr 2012 20:02:15 +0000
(13:02 -0700)
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
t/t9400-git-cvsserver-server.sh
patch
|
blob
|
history
raw
(from parent 1:
8ea0780
)
diff --git
a/t/t9400-git-cvsserver-server.sh
b/t/t9400-git-cvsserver-server.sh
index d3e88f8dd6d0bf79cef3856a187006777881f1c7..806623e8858eef6ebe224ea14a38732f63fd6e49 100755
(executable)
--- 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
'
#------------