From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Avery Pennarun <apenwarr@gmail.com>,
SungHyun Nam <goweol@gmail.com>,
git@vger.kernel.org
Subject: Re: 'git add' regression in git-1.7?
Date: Tue, 9 Mar 2010 17:37:30 -0500 [thread overview]
Message-ID: <20100309223729.GA25265@sigill.intra.peff.net> (raw)
In-Reply-To: <7vhbp0ls26.fsf@alter.siamese.dyndns.org>
On Sun, Feb 28, 2010 at 06:00:17PM -0800, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > I'm not sure of the right way to fix this. We can drop further down into
> > the directory hierarchy when doing COLLECT_IGNORED and look for actual
> > files, but that may have a negative performance impact.
>
> Wouldn't that have negative correctness impact? I don't see an obvious
> way out, other than perhaps checking the set of pathspecs twice. One
> thing that might help is to carry the seen[] array a bit longer so that we
> do not have to lose sight of what paths we were given but didn't match.
Sorry for the very late reply. Day-job has kept me busy.
No, we would still be correct if we recurse into the ignored directory
_only_ to collect the ignored bits (so we don't even bother if
COLLECT_IGNORED isn't set). But what I don't like is that you take a
performance hit, because in most cases you won't ever care what's inside
those directories. You need to recurse only when:
- you actually care about all files. git-add does. git-status does not
(unless you explicitly told it to show directories). So that would
probably need a flag passed to fill_directory.
- you have a pathspec that means the contents of the directory might
be interesting. Right now we check in_pathspec in treat_one_path.
But I think we would need to recognize that "subdir/file" is
means "subdir" is in our pathspec (and that "sub*" means the same
thing).
Your solution does something similar after the fact, but I am not 100%
satisfied with it. I'll respond separately to that patch.
-Peff
next prev parent reply other threads:[~2010-03-09 22:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-19 4:30 'git add' regression in git-1.7? SungHyun Nam
2010-02-19 4:42 ` Avery Pennarun
2010-02-19 5:04 ` SungHyun Nam
2010-02-19 5:15 ` Avery Pennarun
2010-02-19 5:34 ` Jeff King
2010-02-19 6:02 ` Jeff King
2010-02-19 8:24 ` Jeff King
2010-03-01 2:00 ` Junio C Hamano
2010-03-01 3:25 ` [PATCH] add: fail "git add ignored-dir/file" without -f Junio C Hamano
2010-03-01 8:26 ` [PATCH 1/3] t0050: mark non-working test as such Junio C Hamano
2010-03-09 22:37 ` Jeff King [this message]
2010-03-09 23:09 ` 'git add' regression in git-1.7? Jeff King
2010-03-10 7:06 ` Junio C Hamano
2010-03-11 7:15 ` Jeff King
2010-03-14 6:34 ` Junio C Hamano
2010-03-14 20:44 ` Jeff King
2010-03-15 2:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100309223729.GA25265@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=goweol@gmail.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.
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 NNTP newsgroup(s).