Re: Schrödinger's diff

From: Jeff King <peff@peff.net>
Date: Jul 7, 2009, 19:54 UTC
Message-ID: <20090707195406.GA32131@coredump.intra.peff.net>
In-Reply-To: <7vtz1o9sv6.fsf@alter.siamese.dyndns.org>

On Tue, Jul 07, 2009 at 12:48:45PM -0700, Junio C Hamano wrote:

Show 9 quoted lines

> Jeff King <peff@peff.net> writes:
> 
> > .... But even that might have holes,
> > I'm afraid -- we don't always look at all of the config in every
> > command, though perhaps we do for such core functionality.
> 
> I personally do not think it is worth it.  If you change the crlf,
> clean/smudge, or anything of that sort, just doing a "rm .git/index"
> followed by "git reset --hard" would restore sanity to your work tree, no?

Yes, that works fine, but:

  1. It blows away anything unrelated you might have staged.

  2. You have to know to do it (and you get very confusing results if
     you don't), which makes it very unfriendly for newbies.

  3. You have to know to do it, and it isn't documented. :)

(3) at least is not too hard to address. And perhaps (2) is not a big enough issue to care about. This is not a problem we have seen on the list a lot. I suspect it is because most CRLF users are on Windows, and therefore have it setup before the tree is checked out, and there are simply not all that many clean/smudge users.

-Peff