Hi,
On Tue, 13 Oct 2009, Eric Raible wrote:
> 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"
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.
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html