mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 14:34:49 +01:00
Code Activity

Merge branch 'lt/grep' into next

Browse source 
* lt/grep:
  builtin-grep: workaround for non GNU grep.
This commit is contained in:
Junio C Hamano 2006-05-17 15:52:16 -07:00
commit c7e3a75121
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
builtin-grep.c
View file

@ -453,7 +453,6 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
len = nr = 0; len = nr = 0;
push_arg("grep"); push_arg("grep");
push_arg("-H");
if (opt->fixed) if (opt->fixed)
push_arg("-F"); push_arg("-F");
if (opt->linenum) if (opt->linenum)
@ -503,17 +502,35 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
push_arg("-e"); push_arg("-e");
push_arg(p->pattern); push_arg(p->pattern);
} }
push_arg("--");
/*
* To make sure we get the header printed out when we want it,
* add /dev/null to the paths to grep. This is unnecessary
* (and wrong) with "-l" or "-L", which always print out the
* name anyway.
*
* GNU grep has "-H", but this is portable.
*/
if (!opt->name_only && !opt->unmatch_name_only)
push_arg("/dev/null");
hit = 0; hit = 0;
argc = nr; argc = nr;
for (i = 0; i < active_nr; i++) { for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
const char *name;
if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode))) if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode)))
continue; continue;
if (!pathspec_matches(paths, ce->name)) if (!pathspec_matches(paths, ce->name))
continue; continue;
argv[argc++] = ce->name; name = ce->name;
if (name[0] == '-') {
int len = ce_namelen(ce);
name = xmalloc(len + 3);
memcpy(name, "./", 2);
memcpy(name + 2, ce->name, len + 1);
}
argv[argc++] = name;
if (argc < MAXARGS) if (argc < MAXARGS)
continue; continue;
hit += exec_grep(argc, argv); hit += exec_grep(argc, argv);