grep --no-index: don't use git standard exclusions

diff --git a/builtin-grep.c b/builtin-grep.c
index 9bd467c9b90d1c58a59e27fbc6673cb68d855c72..a10946db3c49797ef717734924416df0879b55a1 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -205,6 +205,8 @@ static void *run(void *arg)
 
                work_done(w);
        }
+       free_grep_patterns(arg);
+       free(arg);
 
        return (void*) (intptr_t) hit;
 }
@@ -650,7 +652,6 @@ static int grep_directory(struct grep_opt *opt, const char **paths)
        int i, hit = 0;
 
        memset(&dir, 0, sizeof(dir));
-       setup_standard_excludes(&dir);
 
        fill_directory(&dir, paths);
        for (i = 0; i < dir.nr; i++) {
@@ -760,8 +761,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        struct option options[] = {
                OPT_BOOLEAN(0, "cached", &cached,
                        "search in index instead of in the work tree"),
-               OPT_BOOLEAN(0, "index", &use_index,
-                       "--no-index finds in contents not managed by git"),
+               { OPTION_BOOLEAN, 0, "index", &use_index, NULL,
+                       "finds in contents not managed by git",
+                       PARSE_OPT_NOARG | PARSE_OPT_NEGHELP },
                OPT_GROUP(""),
                OPT_BOOLEAN('v', "invert-match", &opt.invert,
                        "show non-matching lines"),