It took longer than expected, but here is a reroll of the previous series to bring more recent "git grep" enhancements to the "--grep" option of commands in "git log" family. The early part of the series (1-3) refactors the code that reads configuration items related to "grep" and the code that mixes the result with the command line options to prepare grep_opt, which so far lived in builtin/grep.c, and moves them to the grep.[ch] at the top-level. The middle part (4-6) reuses the code to set-up grep_opt refactored by the earlier part of the series on revs->grep_filter that is used in "git log --grep=..." processing. It incidentally fixes a small bug where "git log -F -E --grep='<ere>'" did not look for matches to the pattern in extended regular expression, and adds --basic-regexp and --perl-regexp command line options to "git log" family for completeness. The last one teaches "git log" family to honor the "grep.*" configuration variables, e.g. "grep.patterntype", so that you can say "git -c grep.patterntype=perl log --grep='(?:pcre)'". Obviously, it is too late for this cycle and will not graduate to 'master' before the 1.8.0 final. Junio C Hamano (7): builtin/grep.c: make configuration callback more reusable grep: move the configuration parsing logic to grep.[ch] grep: move pattern-type bits support to top-level grep.[ch] revisions: initialize revs->grep_filter using grep_init() log --grep: use the same helper to set -E/-F options as "git grep" log --grep: accept --basic-regexp and --perl-regexp log: honor grep.* configuration Documentation/rev-list-options.txt | 10 +++ builtin/grep.c | 133 ++-------------------------- builtin/log.c | 8 +- grep.c | 177 +++++++++++++++++++++++++++++++++++++ grep.h | 6 ++ revision.c | 14 ++- t/t4202-log.sh | 6 ++ 7 files changed, 225 insertions(+), 129 deletions(-) -- 1.8.0.rc1.76.g5a375e6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html