Re: [PATCH 7/7] Make --color-words work well with --graph.

From: Thomas Rast <trast@student.ethz.ch>
Date: May 17, 2010, 06:59 UTC
Message-ID: <201005170859.28022.trast@student.ethz.ch>
In-Reply-To: <1273921331-32702-8-git-send-email-struggleyb.nku@gmail.com>

Bo Yang wrote:

Show 17 quoted lines

> @@ -629,20 +640,39 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
>  	} else
>  		plus_begin = plus_end = diff_words->plus.orig[plus_first].end;
>  
> -	if (diff_words->current_plus != plus_begin)
> -		fwrite(diff_words->current_plus,
> -				plus_begin - diff_words->current_plus, 1,
> -				diff_words->file);
> -	if (minus_begin != minus_end)
> -		color_fwrite_lines(diff_words->file,
> +	if (diff_words->current_plus != plus_begin) {
> +		if ((diff_words->current_plus == diff_words->plus.text.ptr &&
> +			diff_words->last_minus == 0) ||
> +			(diff_words->current_plus > diff_words->plus.text.ptr &&
> +			*(diff_words->current_plus - 1) == '\n')) {
> +			fputs(line_prefix, diff_words->opt->file);
> +			print = 1;

Are these border checks needed/the best solution? If so, please can you put an explanation in the commit message?

-- 
Thomas Rast
trast@{inf,student}.ethz.ch