global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

grep -I: do not bother to read known-binary files

Browse Source 
Incidentally, this makes grep -I respect the "binary" attribute (actually,
the "-text" attribute, but "binary" implies that).

Since the attributes are not thread-safe, we now need to switch off
threading if -I was passed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2010-11-08 16:10:43 +01:00
committed by Pat Thoyts
parent d73c3c04cf
commit 0b23a07e0e
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
builtin/grep.c
View File

@@ -18,6 +18,7 @@
#include "quote.h"
#include "dir.h"
#include "thread-utils.h"
#include "attr.h"
static char const * const grep_usage[] = {
"git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]",
@@ -178,6 +179,22 @@ static void work_done(struct work_item *w)
grep_unlock();
}
static int skip_binary(struct grep_opt *opt, const char *filename)
{
if ((opt->binary & GREP_BINARY_NOMATCH)) {
static struct git_attr *attr_text;
struct git_attr_check check;
if (!attr_text)
attr_text = git_attr("text");
memset(&check, 0, sizeof(check));
check.attr = attr_text;
return !git_checkattr(filename, 1, &check) &&
ATTR_FALSE(check.value);
}
return 0;
}
static void *run(void *arg)
{
int hit = 0;
@@ -188,6 +205,9 @@ static void *run(void *arg)
if (!w)
break;
if (skip_binary(opt, (const char *)w->identifier))
continue;
opt->output_priv = w;
if (w->type == WORK_SHA1) {
unsigned long sz;
@@ -505,6 +525,9 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
continue;
if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))
continue;
if (skip_binary(opt, ce->name))
continue;
/*
* If CE_VALID is on, we assume worktree file and its cache entry
* are identical, even if worktree file has been modified, so use
@@ -920,6 +943,8 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
string_list_append(&path_list, show_in_pager);
use_threads = 0;
}
if ((opt.binary & GREP_BINARY_NOMATCH))
use_threads = 0;
if (!opt.pattern_list)
die(_("no pattern given."));