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>

diff --git a/builtin-grep.c b/builtin-grep.c
index 624f86e287cf6304d122850f8258444c5f916702..3c97c2c4d5e067706fb0987ac2390482107bc789 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -20,6 +20,8 @@
 #endif
 #endif
 
 #endif
 #endif
 

+static int builtin_grep;
+

 /*
  * git grep pathspecs are somewhat different from diff-tree pathspecs;
  * pathname wildcards are allowed.
 /*
  * 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
         */
         * 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;
                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;
                }
                        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;
                if (!strcmp("-a", arg) ||
                    !strcmp("--text", arg)) {
                        opt.binary = GREP_BINARY_TEXT;