diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-21 17:37:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-21 17:37:54 -0700 |
| commit | 7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704 (patch) | |
| tree | 6cd08641883391adac6e12352017eb544df0f7e8 /builtin-grep.c | |
| parent | Merge branch 'js/fmt-patch' into next (diff) | |
| parent | mailinfo: skip bogus UNIX From line inside body (diff) | |
| download | tgif-7b8e4ab07c6ebc72e311804c9c79ef93cfbbe704.tar.xz | |
Merge branch 'jc/mailinfo' into next
* jc/mailinfo:
mailinfo: skip bogus UNIX From line inside body
tutorial-2: typofix in examples.
tutorial: add discussion of index file, object database
tutorial: expanded discussion of commit history
tutorial: replace "whatchanged" by "log"
NO_INET_NTOP and compat/inet_ntop.c for some systems (e.g. old Cygwin).
remove superflous "const"
checkdiff_consume: strtol parameter fix.
Elaborate on why ':' is a bad idea in a ref name.
Reference git-check-ref-format in git-branch.
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index d09ddf0485..53de8a8836 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -518,7 +518,7 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached) argc = nr; for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; - const char *name; + char *name; if (ce_stage(ce) || !S_ISREG(ntohl(ce->ce_mode))) continue; if (!pathspec_matches(paths, ce->name)) |