From: Junio C Hamano Date: Sun, 11 Oct 2009 22:22:05 GMT Subject: Re: [PATCH] git-add--interactive: never skip files included in index Message-ID: <7vpr8tr2pe.fsf@alter.siamese.dyndns.org> In-Reply-To: <20091011191440.GA2532@coredump.intra.peff.net> Jeff King writes: > On Sun, Oct 11, 2009 at 11:52:10AM -0700, Junio C Hamano wrote: > >> Thanks. >> >> The change looks innocent enough and I do not expect to see any unexpected >> regressions from it, but it is a bit too late for 1.6.5 cycle, so let's >> queue this fix and aim for 1.6.5.1. > > I think this patch is good to apply, as there is no conceivable reason > to even look at excludes when listing modified files. > > But this triggered my spider sense; shouldn't --exclude-standard simply > be a no-op for ls-files when we are not listing untracked files? And > bisecting, it seems that it is a very old regression caused by 63d285c > (per-directory-exclude: lazily read .gitignore files, 2007-11-29). > > I don't know if it is worth fixing now or not. It does seem a bit > inconsistent to me (since everything else is very clear that .gitignore > is only about untracked files), but nobody seems to have been > complaining for the last two years (and they may have, in fact, been > coding to the new behavior). This is one of those moments when I feel very blessed to have competent and diligent people around me ;-) I think you are right; that we shouldn't filter the output with gitignore entries when showing what is _in_ the index.