From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: BUG: mergetool fails on gitignore:d files
Date: Sun, 31 May 2009 22:03:50 -0400 [thread overview]
Message-ID: <20090601020349.GA32740@coredump.intra.peff.net> (raw)
In-Reply-To: <20090530215418.GA19241@coredump.intra.peff.net>
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
next prev parent reply other threads:[~2009-06-01 2:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-30 15:30 BUG: mergetool fails on gitignore:d files Erik Sandberg
2009-05-30 16:38 ` Markus Heidelberg
2009-05-30 21:54 ` Jeff King
2009-06-01 2:03 ` Jeff King [this message]
2009-06-01 2:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090601020349.GA32740@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).