Re: [PATCH 2/6] grep: move context hunk mark handling into show_line()

[René Scharfe <rene.scharfe@xxxxxxxxxxxxxx>]

Junio C Hamano schrieb:
> René Scharfe <rene.scharfe@xxxxxxxxxxxxxx> writes:
> 
>> Move last_shown into struct grep_opt, to make it available in
>> show_line(), and then make the function handle the printing of hunk
>> marks for context lines in a central place.
> 
> Makes sense.  But now "are we showing from a separate block of text" check
> is in show_line() and relieves the caller of show_line() from doing so,...
> 
>>  		else if (last_hit &&
>>  			 lno <= last_hit + opt->post_context) {
>>  			/* If the last hit is within the post context,
>>  			 * we need to show this line.
>>  			 */
>> -			if (last_shown && lno != last_shown + 1)
>> -				fputs(hunk_mark, stdout);
>>  			show_line(opt, bol, eol, name, lno, '-');
>> -			last_shown = lno;
> 
> ... the comment in this context should go, no?

Hmm, I didn't read it to refer to the hunk_mark, but rather to the line
 (from bol to eol).  And it's still true that show_line needs to be
called because we're not more than post_context lines away from the
previous hit, i.e. this line is a post context line.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html