diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:23 -0700 |
| commit | ab1e76b88c836b16f37083910a4b1844fb4ddaca (patch) | |
| tree | 1c4363d4f2139c0e6d6315bf951d5da92190075f /builtin/grep.c | |
| parent | Merge branch 'rs/diff-cleanup-records-fix' (diff) | |
| parent | Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude (diff) | |
| download | tgif-ab1e76b88c836b16f37083910a4b1844fb4ddaca.tar.xz | |
Merge branch 'jc/grep-untracked-exclude'
* jc/grep-untracked-exclude:
grep: teach --untracked and --exclude-standard options
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 91c3a852f6..024b87868a 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -640,12 +640,15 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, return hit; } -static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec) +static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec, + int exc_std) { struct dir_struct dir; int i, hit = 0; memset(&dir, 0, sizeof(dir)); + if (exc_std) + setup_standard_excludes(&dir); fill_directory(&dir, pathspec->raw); for (i = 0; i < dir.nr; i++) { @@ -752,7 +755,7 @@ static int help_callback(const struct option *opt, const char *arg, int unset) int cmd_grep(int argc, const char **argv, const char *prefix) { int hit = 0; - int cached = 0; + int cached = 0, untracked = 0, opt_exclude = -1; int seen_dashdash = 0; int external_grep_allowed__ignored; const char *show_in_pager = NULL, *default_pager = "dummy"; @@ -779,6 +782,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix) { OPTION_BOOLEAN, 0, "index", &use_index, NULL, "finds in contents not managed by git", PARSE_OPT_NOARG | PARSE_OPT_NEGHELP }, + OPT_BOOLEAN(0, "untracked", &untracked, + "search in both tracked and untracked files"), + OPT_SET_INT(0, "exclude-standard", &opt_exclude, + "search also in ignored files", 1), OPT_GROUP(""), OPT_BOOLEAN('v', "invert-match", &opt.invert, "show non-matching lines"), @@ -1048,13 +1055,16 @@ int cmd_grep(int argc, const char **argv, const char *prefix) if (!show_in_pager) setup_pager(); + if (!use_index && (untracked || cached)) + die(_("--cached or --untracked cannot be used with --no-index.")); - if (!use_index) { - if (cached) - die(_("--cached cannot be used with --no-index.")); + if (!use_index || untracked) { + int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude; if (list.nr) - die(_("--no-index cannot be used with revs.")); - hit = grep_directory(&opt, &pathspec); + die(_("--no-index or --untracked cannot be used with revs.")); + hit = grep_directory(&opt, &pathspec, use_exclude); + } else if (0 <= opt_exclude) { + die(_("--exclude or --no-exclude cannot be used for tracked contents.")); } else if (!list.nr) { if (!cached) setup_work_tree(); |