Hi,
Attached is the second re-roll of my series to teach 'git grep
--only-matching'. Since last time, not much has changed. The change I
did include is summarized below, and an inter-diff is attached as
always.
- Initialize both match_color and line_color to NULL, thereby
silencing a compiler warning where match_color was given to
opt->output_color uninitialized [1].
Thanks in advance for your review :-).
Thanks,
Taylor
[1]: https://public-inbox.org/git/[email protected]/
Taylor Blau (2):
grep.c: extract show_line_header()
grep.c: teach 'git grep --only-matching'
builtin/grep.c | 6 ++++
grep.c | 91 +++++++++++++++++++++++++++++++------------------
grep.h | 1 +
t/t7810-grep.sh | 15 ++++++++
4 files changed, 80 insertions(+), 33 deletions(-)
Inter-diff (since v1):
diff --git a/grep.c b/grep.c
index 48cca6723e..49a744f96b 100644
--- a/grep.c
+++ b/grep.c
@@ -1448,7 +1448,8 @@ static void show_line(struct grep_opt *opt, char *bol,
char *eol,
const char *name, unsigned lno, ssize_t cno, char sign)
{
int rest = eol - bol;
- const char *match_color, *line_color = NULL;
+ const char *match_color = NULL;
+ const char *line_color = NULL;
if (opt->file_break && opt->last_shown == 0) {
if (opt->show_hunk_mark)
--
2.18.0