Re: BUG: mergetool fails on gitignore:d files

From: Jeff King <peff@peff.net>
Date: Jun 1, 2009, 02:03 UTC
Message-ID: <20090601020349.GA32740@coredump.intra.peff.net>
In-Reply-To: <20090530215418.GA19241@coredump.intra.peff.net>

On Sat, May 30, 2009 at 05:54:18PM -0400, Jeff King wrote:

Show 13 quoted lines

> diff --git a/dir.c b/dir.c
> index 0e6b752..bbfcb56 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -396,7 +396,7 @@ static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathna
>  
>  static struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len)
>  {
> -	if (cache_name_pos(pathname, len) >= 0)
> +	if (!cache_name_is_other(pathname, len))
>  		return NULL;
>  
>  	ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc);

I was all set to write a test for this and re-submit, but you seem to have beat me to it. Thanks. :)

-Peff