Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead
commite2d2e383d87dcbcd296ca9f21f3c8b7ef853c928
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2010 08:56:15 +0000 (12 00:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Jan 2010 08:58:13 +0000 (12 00:58 -0800)
tree1cd0fcf96fe378a0c27a2b3b06ca4af9463fac78
parent902f235378cb2b2f6dd5dd664b9630c95321f0ae
parenta26345b6085340ebd61e156aa8154a80196bee0f
Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead

* jc/maint-1.6.4-grep-lookahead:
  grep: optimize built-in grep by skipping lines that do not hit

This needs to be an evil merge as fixmatch() changed signature since
5183bf6 (grep: Allow case insensitive search of fixed-strings,
2009-11-06).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
grep.c