[msysgit? bug] crlf double-conversion on win32
- From
- Yann Dirson <y.dirson@e-sidor.com>
- Date
- Oct 13, 2009, 20:49 UTC
- Message-ID
- <38cfaa83fdf80dec3a3d81ed3e0de0e2.squirrel@intranet.linagora.com>
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).