diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-12-12 21:16:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 23:45:42 (GMT) |
| commit | b8ffedca6f9e1043956ba611ae52bea449779456 (patch) | |
| tree | 51725ec80c72f114e83e40091b5dc36f4737cf8e /grep.c | |
| parent | 9859a023fef30ffebdd22ad9639c587ac720b8b6 (diff) | |
| download | git-b8ffedca6f9e1043956ba611ae52bea449779456.zip git-b8ffedca6f9e1043956ba611ae52bea449779456.tar.gz git-b8ffedca6f9e1043956ba611ae52bea449779456.tar.bz2 | |
grep: load funcname patterns for -W
git-grep avoids loading the funcname patterns unless they are needed.
ba8ea74 (grep: add option to show whole function as context,
2011-08-01) forgot to extend this test also to the new funcbody
feature. Do so.
The catch is that we also have to disable threading when using
userdiff, as explained in grep_threads_ok(). So we must be careful to
introduce the same test there.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
| -rw-r--r-- | grep.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -948,8 +948,8 @@ int grep_threads_ok(const struct grep_opt *opt) * machinery in grep_buffer_1. The attribute code is not * thread safe, so we disable the use of threads. */ - if (opt->funcname && !opt->unmatch_name_only && !opt->status_only && - !opt->name_only) + if ((opt->funcname || opt->funcbody) + && !opt->unmatch_name_only && !opt->status_only && !opt->name_only) return 0; return 1; @@ -1008,7 +1008,8 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name, } memset(&xecfg, 0, sizeof(xecfg)); - if (opt->funcname && !opt->unmatch_name_only && !opt->status_only && + if ((opt->funcname || opt->funcbody) + && !opt->unmatch_name_only && !opt->status_only && !opt->name_only && !binary_match_only && !collect_hits) { struct userdiff_driver *drv = userdiff_find_by_path(name); if (drv && drv->funcname.pattern) { |