Re: [PATCH] diffcore-rename: favour identical basenames

From: Jeff King <peff@peff.net>
Date: Jun 22, 2007, 05:41 UTC
Message-ID: <20070622054142.GA7699@coredump.intra.peff.net>
In-Reply-To: <Pine.LNX.4.64.0706220214250.4059@racer.site>

On Fri, Jun 22, 2007 at 02:14:43AM +0100, Johannes Schindelin wrote:

Show 13 quoted lines

> @@ -313,20 +297,24 @@ void diffcore_rename(struct diff_options *options)
>  			if (rename_dst[i].pair)
>  				continue; /* dealt with an earlier round */
>  			for (j = 0; j < rename_src_nr; j++) {
> -				int k;
> +				int k, distance;
>  				struct diff_filespec *one = rename_src[j].one;
>  				if (!is_exact_match(one, two, contents_too))
>  					continue;
>  
> +				distance = levenshtein(one->path, two->path);
>  				/* see if there is a basename match, too */
>  				for (k = j; k < rename_src_nr; k++) {

This loop can start at k = j+1, since otherwise we are just checking rename_src[j] against itself.

Show 9 quoted lines

> +int levenshtein(const char *string1, const char *string2)
> +{
> +	int len1 = strlen(string1), len2 = strlen(string2);
> +	int *row1 = xmalloc(sizeof(int) * (len2 + 1));
> +	int *row2 = xmalloc(sizeof(int) * (len2 + 1));
> +	int i, j;
> +
> +	for (j = 1; j <= len2; j++)
> +		row1[j] = j;

This loop must start at j=0, not j=1; otherwise you have an undefined value in row1[0], which gets read when setting row2[1], and you get a totally meaningless distance (I got -1209667248 on my test case!).

-Peff