mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
grep: support --no-ext-grep to test builtin grep
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8104ebfe82
commit
e70b9a8bd2
1 changed files with 7 additions and 1 deletions
|
@ -20,6 +20,8 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
static int builtin_grep;
|
||||
|
||||
/*
|
||||
* git grep pathspecs are somewhat different from diff-tree pathspecs;
|
||||
* pathname wildcards are allowed.
|
||||
|
@ -389,7 +391,7 @@ static int grep_cache(struct grep_opt *opt, const char **paths, int cached)
|
|||
* we grep through the checked-out files. It tends to
|
||||
* be a lot more optimized
|
||||
*/
|
||||
if (!cached) {
|
||||
if (!cached && !builtin_grep) {
|
||||
hit = external_grep(opt, paths, cached);
|
||||
if (hit >= 0)
|
||||
return hit;
|
||||
|
@ -545,6 +547,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
|
|||
cached = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp("--no-ext-grep", arg)) {
|
||||
builtin_grep = 1;
|
||||
continue;
|
||||
}
|
||||
if (!strcmp("-a", arg) ||
|
||||
!strcmp("--text", arg)) {
|
||||
opt.binary = GREP_BINARY_TEXT;
|
||||
|
|
Loading…
Reference in a new issue