From: Junio C Hamano Date: Fri, 30 Oct 2009 19:51:13 GMT Subject: Re: Bug#553296: gitignore broken completely Message-ID: <7vvdhwk6dq.fsf@alter.siamese.dyndns.org> In-Reply-To: <20091030190552.GA3528@coredump.intra.peff.net> Jeff King writes: > On Fri, Oct 30, 2009 at 02:41:55PM -0400, Jeff King wrote: > >> > 6. Revert the patch and rework it so that it will only have effect if >> > there is no -i option on the command line. (That is similiar to a >> > mix of 3 and 4.) >> >> Yeah, that would actually be the least invasive change, and would keep >> "-i" just as it is. If we do anything except a simple, I think your (6) >> makes the most sense. >> >> Let me see if I can make a patch. > > Here it is. I think this is the right thing to do. Junio? I am not sure; my head spins when I see "tracked but ignored" (you have a new one in the test) which is quite a bogus concept. Does it mean "tracked but would be ignored if it weren't---perhaps it was added by mistake?"?