Re: BUG: mergetool fails on gitignore:d files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

> 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
--
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]