diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 10:00:38 -0700 |
commit | 8a8895baaf9d200c907555fd30b0b6190b708a5a (patch) | |
tree | 9ca717cf5314effc5dc09528bd4ff9c1c0bfe3bf /t | |
parent | 96b7c4deb8152cbc6a90c6d26ad6869b45a51e9b (diff) | |
parent | d190a0875ff0f33d60a4d7265f2098b35d162f68 (diff) | |
download | git-8a8895baaf9d200c907555fd30b0b6190b708a5a.tar.gz |
Merge branch 'fk/use-kwset-pickaxe-grep-f'
* fk/use-kwset-pickaxe-grep-f:
obstack: Fix portability issues
Use kwset in grep
Use kwset in pickaxe
Adapt the kwset code to Git
Add string search routines from GNU grep
Add obstack.[ch] from EGLIBC 2.10
Diffstat (limited to 't')
-rwxr-xr-x | t/t7008-grep-binary.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh index e058d184d1..917a264eea 100755 --- a/t/t7008-grep-binary.sh +++ b/t/t7008-grep-binary.sh @@ -84,7 +84,7 @@ test_expect_success 'git grep -Fi Y<NUL>f a' " git grep -f f -Fi a " -test_expect_failure 'git grep -Fi Y<NUL>x a' " +test_expect_success 'git grep -Fi Y<NUL>x a' " printf 'YQx' | q_to_nul >f && test_must_fail git grep -f f -Fi a " @@ -94,7 +94,7 @@ test_expect_success 'git grep y<NUL>f a' " git grep -f f a " -test_expect_failure 'git grep y<NUL>x a' " +test_expect_success 'git grep y<NUL>x a' " printf 'yQx' | q_to_nul >f && test_must_fail git grep -f f a " |