git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] grep.c: teach 'git grep --only-matching'

From
Taylor Blau <me@ttaylorr.com>
Date
Jun 27, 2018, 21:22 UTC
Message-ID
<20180627212248.GA1282@syl.attlocal.net>
In-Reply-To
<xmqq6024djf2.fsf@gitster-ct.c.googlers.com>
On Wed, Jun 27, 2018 at 02:11:13PM -0700, Junio C Hamano wrote:
Show 24 quoted lines
> Taylor Blau <me@ttaylorr.com> writes:
>
> >> Just initializing match_color where it is defined at the beginning of
> >> show_line() should be sufficient, I think.
> >
> > I think that we could also use the following, and leave the `if
> > (opt->color)` conditional where it is:
> >
> > diff --git a/grep.c b/grep.c
> > index 48cca6723e..b985fb3ee0 100644
> > --- a/grep.c
> > +++ b/grep.c
> > @@ -1448,7 +1448,7 @@ 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, *line_color = NULL;
> >
> >  	if (opt->file_break && opt->last_shown == 0) {
> >  		if (opt->show_hunk_mark)
>
> You say "we could also", but the above is exactly what I suggested,
> so we seem to be on the same page, which is good ;-)

Ah, sorry -- I misinterpreted your meaning "initializing match_color where it is defined" to mean bringing the large `if (opt->color)` conditional up, instead of just assigning to NULL.

Let's do that and leave the `if (opt->color)` block where it is?

Thanks, Taylor

Previous: Junio C HamanoNext: Jeff King
Message 7 of 28 in “grep.c: teach --only-matching to 'git-grep(1)'”
  1. 0/2 grep.c: teach --only-matching to 'git-grep(1)'Taylor Blau, Jun 25, 2018
  2. 1/2 grep.c: extract show_line_header()Taylor Blau, Jun 25, 2018
  3. 2/2 grep.c: teach 'git grep --only-matching'Taylor Blau, Jun 25, 2018
  4. Junio C HamanoJun 27, 2018
  5. Taylor BlauJun 27, 2018
  6. Junio C HamanoJun 27, 2018
  7. Taylor BlauJun 27, 2018
  8. Jeff KingJun 28, 2018
  9. 0/2 teach --only-matching to 'git-grep(1)'Taylor Blau, Jul 2, 2018
  10. 1/2 grep.c: extract show_line_header()Taylor Blau, Jul 2, 2018
  11. 2/2 grep.c: teach 'git grep --only-matching'Taylor Blau, Jul 2, 2018
  12. Jeff KingJul 3, 2018
  13. Jeff KingJul 3, 2018
  14. Junio C HamanoJul 3, 2018
  15. 0/2 grep.c: teach --only-matching to 'git-grep(1)'Taylor Blau, Jul 3, 2018
  16. 1/2 grep.c: extract show_line_header()Taylor Blau, Jul 3, 2018
  17. 2/2 grep.c: teach 'git grep --only-matching'Taylor Blau, Jul 3, 2018
  18. grep.c: teach 'git grep --only-matching'Taylor Blau, Jul 4, 2018
  19. Taylor BlauJul 4, 2018
  20. Junio C HamanoJul 6, 2018
  21. Jeff KingJul 5, 2018
  22. Taylor BlauJul 5, 2018
  23. Junio C HamanoJul 6, 2018
  24. Taylor BlauJul 6, 2018
  25. Jeff KingJul 6, 2018
  26. Junio C HamanoJul 6, 2018
  27. grep.c: teach 'git grep --only-matching'Taylor Blau, Jul 9, 2018
  28. Taylor BlauJul 9, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.