Re: Schrödinger's diff

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: Schrödinger's diff

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:02

Jeff King [off-list ref] writes:
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.
A much more important reason is that it is a one-time event.  You notice
that you screwed up the configuration to use your peculiar work tree
representation, and you fix it once and for all.  Because not only it is a
one-time event but because it is a big-deal event, I do not think it is
something people even would want to think about doing it while having
local changes, so I suspect #1 is also a non-issue.

Re: Schrödinger's diff

From: Eric Raible <hidden>
Date: 2016-06-15 22:47:02

On Tue, Jul 7, 2009 at 3:22 PM, Junio C Hamano[off-list ref] wrote:
You notice
that you screwed up the configuration to use your peculiar work tree
representation, and you fix it once and for all.
A kinda dim-witted question:

So what's the best way of "fixing once and for all" a repo infected with
carriage returns when you want to use autocrlf=true moving forward?

And a hopefully less annoying one:

Would you accept a patch explaining how "git reset --hard" doesn't
actually rebuild the index from scratch, and how "git read-head" might
be recommended in some weird situations?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help