git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [msysgit? bug] crlf double-conversion on win32

From
EREric Raible <raible@gmail.com>
Date
Oct 13, 2009, 22:17 UTC
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:
Show 11 quoted lines
> 
> 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"
Previous: Yann DirsonNext: Johannes Schindelin
Message 2 of 7 in “[msysgit? bug] crlf double-conversion on win32”
  1. Yann DirsonOct 13, 2009
  2. Eric RaibleOct 13, 2009
  3. Johannes SchindelinOct 14, 2009
  4. Laurent BoulardOct 14, 2009
  5. Eric RaibleOct 14, 2009
  6. Junio C HamanoOct 14, 2009
  7. Eric RaibleOct 14, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.