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

[msysgit? bug] crlf double-conversion on win32

From
YDYann 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).

Next: Eric Raible
Message 1 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.