diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:35 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 23:47:36 (GMT) |
commit | 5b84280c65bef19bc3a810e17474c9861ea7ce89 (patch) | |
tree | c534ac39e58573c776dcd9702636496a5cd000ad /revision.c | |
parent | 2e65591ed61ab488395c454004106a5e9424648e (diff) | |
parent | 04bf052eef53c6be04d313d8ce11690beaf890b6 (diff) | |
download | git-5b84280c65bef19bc3a810e17474c9861ea7ce89.zip git-5b84280c65bef19bc3a810e17474c9861ea7ce89.tar.gz git-5b84280c65bef19bc3a810e17474c9861ea7ce89.tar.bz2 |
Merge branch 'ab/grep-patterntype'
Some code clean-up in the "git grep" machinery.
* ab/grep-patterntype:
grep: simplify config parsing and option parsing
grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
grep.h: make "grep_opt.pattern_type_option" use its enum
grep API: call grep_config() after grep_init()
grep.c: don't pass along NULL callback value
built-ins: trust the "prefix" from run_builtin()
grep tests: add missing "grep.patternType" config tests
grep tests: create a helper function for "BRE" or "ERE"
log tests: check if grep_config() is called by "log"-like cmds
grep.h: remove unused "regex_t regexp" from grep_opt
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1846,7 +1846,7 @@ void repo_init_revisions(struct repository *r, revs->commit_format = CMIT_FMT_DEFAULT; revs->expand_tabs_in_log_default = 8; - grep_init(&revs->grep_filter, revs->repo, prefix); + grep_init(&revs->grep_filter, revs->repo); revs->grep_filter.status_only = 1; repo_diff_setup(revs->repo, &revs->diffopt); @@ -2882,8 +2882,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s diff_setup_done(&revs->diffopt); - grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED, - &revs->grep_filter); if (!is_encoding_utf8(get_log_output_encoding())) revs->grep_filter.ignore_locale = 1; compile_grep_patterns(&revs->grep_filter); |