user/sven/git.git/grep.c, branch v1.8.0.2

Merge branch 'nd/grep-true-path' into maint

2012-11-19T03:32:30Z

"git grep -e pattern " asked the attribute system to read ":.gitattributes" file in the working tree, which was nonsense. * nd/grep-true-path: grep: stop looking at random places for .gitattributes

grep: stop looking at random places for .gitattributes

2012-10-12T15:24:44Z

grep searches for .gitattributes using "name" field in struct grep_source but that field is not real on-disk path name. For example, "grep pattern rev" fills the field with "rev:path", and Git looks for .gitattributes in the (non-existent but exploitable) path "rev:path" instead of "path". This patch passes real paths down to grep_source_load_driver() when: - grep on work tree - grep on the index - grep a commit (or a tag if it points to a commit) so that these cases look up .gitattributes at proper paths. .gitattributes lookup is disabled in all other cases. Initial-work-by: Jeff King Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

revisions: initialize revs->grep_filter using grep_init()

2012-10-10T06:21:29Z

Instead of using the hand-rolled initialization sequence, use grep_init() to populate the necessary bits. This opens the door to allow the calling commands to optionally read grep.* configuration variables via git_config() if they want to. Signed-off-by: Junio C Hamano

grep: move pattern-type bits support to top-level grep.[ch]

2012-10-10T06:21:29Z

Switching between -E/-G/-P/-F correctly needs a lot more than just flipping opt->regflags bit these days, and we have a nice helper function buried in builtin/grep.c for the sole use of "git grep". Extract it so that "log --grep" family can also use it. Signed-off-by: Junio C Hamano

grep: move the configuration parsing logic to grep.[ch]

2012-10-09T23:17:50Z

The configuration handling is a library-ish part of this program, that is not specific to "git grep" command. It should be reusable by "log" and others. Signed-off-by: Junio C Hamano

log --grep-reflog: reject the option without -g

2012-09-29T19:07:04Z

Signed-off-by: Junio C Hamano

revision: add --grep-reflog to filter commits by reflog messages

2012-09-29T18:41:14Z

Similar to --author/--committer which filters commits by author and committer header fields. --grep-reflog adds a fake "reflog" header to commit and a grep filter to search on that line. All rules to --author/--committer apply except no timestamp stripping. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

grep: prepare for new header field filter

2012-09-29T18:40:58Z

grep supports only author and committer headers, which have the same special treatment that later headers may or may not have. Check for field type and only strip_timestamp() when the field is either author or committer. GREP_HEADER_FIELD_MAX is put in the grep_header_field enum to be calculated automatically, correctly, as long as it's at the end of the enum. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

grep.c: make two symbols really file-scope static this time

2012-09-20T21:20:09Z

Adding a declaration at the beginning is not sufficient for obvious reasons. The definition has to be made static. Signed-off-by: Junio C Hamano

grep.c: mark private file-scope symbols as static

2012-09-16T06:35:39Z

Signed-off-by: Junio C Hamano