git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Raible <raible@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [msysgit? bug] crlf double-conversion on win32
Date: Wed, 14 Oct 2009 11:17:31 -0700	[thread overview]
Message-ID: <279b37b20910141117s7980c249tab4565c93b389df3@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0910141601580.4985@pacific.mpi-cbg.de>

On Wed, Oct 14, 2009 at 7:03 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Hi,
>
> On Tue, 13 Oct 2009, Eric Raible wrote:
>
>>
>> See http://thread.gmane.org/gmane.comp.version-control.git/122823/focus=122862
>>
>> In which Junio suggests:
>> $ rm .git/index
>> $ git reset --hard
>>
>> in order to "restore sanity to your work tree"
>
> Of course this is insane as a user interface.  It is not even plumbing.
>
> So I started some time ago to code a "git checkout --fix-crlf", but I
> am not really happy with the user interface.  I think that Git should
> realize itself that something went wrong with the line endings.  If I say
> "git reset --hard", it is just a bug in Git when it insists afterwards
> that the files are modified.

I fully agree that "git reset --hard" should actually, uh, do a hard reset,
as should be clear in the my reply to Junio's suggestion.  So I'm not
advocating "rm .git/index" as a good solution, but simply one that works.

  parent reply	other threads:[~2009-10-14 18:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-13 20:49 [msysgit? bug] crlf double-conversion on win32 Yann Dirson
2009-10-13 22:17 ` Eric Raible
2009-10-14 14:03   ` Johannes Schindelin
2009-10-14 15:59     ` Laurent Boulard
2009-10-14 18:17     ` Eric Raible [this message]
2009-10-14 18:47     ` Junio C Hamano
2009-10-14 20:46       ` Eric Raible

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=279b37b20910141117s7980c249tab4565c93b389df3@mail.gmail.com \
    --to=raible@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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).