From: Jeff King Date: Mon, 29 Oct 2012 08:12:15 +0000 (-0400) Subject: Merge branch 'jc/grep-pcre-loose-ends' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d2f4469b13dcd5c850058fdee4b039f07bb33142;p=git.git Merge branch 'jc/grep-pcre-loose-ends' "git log -F -E --grep=''" failed to use the given pattern as extended regular expression, and instead looked for the string literally. The early part of this series is a fix for it; the latter part teaches log to respect the grep.* configuration. * jc/grep-pcre-loose-ends: log: honor grep.* configuration log --grep: accept --basic-regexp and --perl-regexp log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable --- d2f4469b13dcd5c850058fdee4b039f07bb33142