From: Eric Raible <raible@gmail.com>
Date: Tue, 13 Oct 2009 22:17:53 GMT
Subject: Re: [msysgit? bug] crlf double-conversion on win32
Message-ID: <loom.20091014T001602-378@post.gmane.org>
In-Reply-To: <38cfaa83fdf80dec3a3d81ed3e0de0e2.squirrel@intranet.linagora.com>

Yann Dirson <y.dirson <at> e-sidor.com> writes:

> 
> With a msysgit 1.6.4 package, I got stuck after someone copied a CRLF file
> to a Linux box and committed it.
> 
> In that situation, the win32 client in autocrlf mode keeps telling that
> the files are locally modified, even after eg "git reset --hard".  Without
> touching the crlf setting (which I believe should not ever be necessary),
> this can be corrected by committing the faulty files after dos2unix'ing
> them, and using "git fetch && git reset --hard origin/master" ("git pull
> --rebase" refuses to do the job since it believes there are local
> changes).

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"