git/grep.c, branch v1.6.3

Merge branch 'maint'

2009-04-28T07:46:39Z

* maint: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

Merge branch 'maint-1.6.1' into maint

2009-04-28T07:46:25Z

* maint-1.6.1: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-28T07:46:20Z

* maint-1.6.0: grep: fix segfault when "git grep '('" is given Documentation: fix a grammatical error in api-builtin.txt builtin-merge: fix a typo in an error message

grep: fix segfault when "git grep '('" is given

2009-04-28T00:28:18Z

Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

git log: avoid segfault with --all-match

2009-03-19T02:10:40Z

Avoid a segfault when the command git log --all-match was issued, by ignoring the option. Signed-off-by: Michele Ballabio Signed-off-by: Junio C Hamano

grep: cast printf %.*s "precision" argument explicitly to int

2009-03-09T01:22:44Z

On some systems, regoff_t that is the type of rm_so/rm_eo members are wider than int; %.*s precision specifier expects an int, so use an explicit cast. A breakage reported on Darwin by Brian Gernhardt should be fixed with this patch. Signed-off-by: Junio C Hamano

grep: color patterns in output

2009-03-07T19:34:59Z

Coloring matches makes them easier to spot in the output. Add two options and two parameters: color.grep (to turn coloring on or off), color.grep.match (to set the color of matches), --color and --no-color (to turn coloring on or off, respectively). The output of external greps is not changed. This patch is based on earlier ones by Nguyễn Thái Ngọc Duy and Thiago Alves. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: add pmatch and eflags arguments to match_one_pattern()

2009-03-07T19:34:57Z

Push pmatch and eflags to the callers of match_one_pattern(), which allows them to specify regex execution flags and to get the location of a match. Since we only use the first element of the matches array and aren't interested in submatches, no provision is made for callers to provide a larger array. eflags are ignored for fixed patterns, but that's OK, since they only have a meaning in connection with regular expressions containing ^ or $. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: remove grep_opt argument from match_expr_eval()

2009-03-07T19:34:56Z

The only use of the struct grep_opt argument of match_expr_eval() is to pass the option word_regexp to match_one_pattern(). By adding a pattern flag for it we can reduce the number of function arguments of these two functions, as a cleanup and preparation for adding more in the next patch. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: micro-optimize hit collection for AND nodes

2009-03-07T19:34:53Z

In addition to returning if an expression matches a line, match_expr_eval() updates the expression's hit flag if the parameter collect_hits is set. It never sets collect_hits for children of AND nodes, though, so their hit flag will never be updated. Because of that we can return early if the first child didn't match, no matter if collect_hits is set or not. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano