git/grep.c, branch v1.7.2

grep: support NUL chars in search strings for -F

2010-05-24T18:22:07Z

Search patterns in a file specified with -f can contain NUL characters. The current code ignores all characters on a line after a NUL. Pass the actual length of the line all the way from the pattern file to fixmatch() and use it for case-sensitive fixed string matching. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: use REG_STARTEND for all matching if available

2010-05-24T18:22:07Z

Refactor REG_STARTEND handling inlook_ahead() into a new helper, regmatch(), and use it for line matching, too. This allows regex matching beyond NUL characters if regexec() supports the flag. NUL characters themselves are not matched in any way, though. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: continue case insensitive fixed string search after NUL chars

2010-05-24T18:22:07Z

Functions for C strings, like strcasestr(), can't see beyond NUL characters. Check if there is such an obstacle on the line and try again behind it. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: use memmem() for fixed string search

2010-05-24T18:22:06Z

Allow searching beyond NUL characters by using memmem() instead of strstr(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: --name-only over binary

2010-05-24T18:22:06Z

As with the option -c/--count, git grep with the option -l/--name-only should work the same with binary files as with text files because there is no danger of messing up the terminal with control characters from the contents of matching files. GNU grep does the same. Move the check for ->name_only before the one for binary_match_only, thus making the latter irrelevant for git grep -l. Reported-by: Dmitry Potapov Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: --count over binary

2010-05-24T18:22:06Z

The intent of showing the message "Binary file xyz matches" for binary files is to avoid annoying users by potentially messing up their terminals by printing control characters. In --count mode, this precaution isn't necessary. Display counts of matches if -c/--count was specified, even if -a was not given. GNU grep does the same. Moving the check for ->count before the code for handling binary file also avoids printing context lines if --count and -[ABC] were used together, so we can remove the part of the comment that mentions this behaviour. Again, GNU grep does the same. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

grep: grep: refactor handling of binary mode options

2010-05-24T18:22:06Z

Turn the switch inside-out and add labels for each possible value of ->binary. This makes the code easier to read and avoids calling buffer_is_binary() if the option -a was given. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/threaded-grep-context'

2010-04-03T19:28:39Z

* rs/threaded-grep-context: grep: enable threading for context line printing Conflicts: grep.c

Merge branch 'ml/color-grep'

2010-03-20T18:29:36Z

* ml/color-grep: grep: Colorize selected, context, and function lines grep: Colorize filename, line number, and separator Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

grep: enable threading for context line printing

2010-03-15T22:26:35Z

If context lines are to be printed, grep separates them with hunk marks ("--\n"). These marks are printed between matches from different files, too. They are not printed before the first file, though. Threading was disabled when context line printing was enabled because avoiding to print the mark before the first line was an unsolved synchronisation problem. This patch separates the code for printing hunk marks for the threaded and the unthreaded case, allowing threading to be turned on together with the common -ABC options. ->show_hunk_mark, which controls printing of hunk marks between files in show_line(), is now set in grep_buffer_1(), but only if some results have already been printed and threading is disabled. The threaded case is handled in work_done(). Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano