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

Re: Cannot checkout after setting the eol attribute

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 22, 2017, 20:03 UTC
Message-ID
<xmqqziar1iau.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20170822191318.GA22118@tor.lan>
Torsten Bögershausen <tboegi@web.de> writes:
Show 9 quoted lines
> The following would solve your problem:
>    git init
>    echo $'dos\r' > dos
>    git add dos
>    git commit -m "dos newlines"
>    echo "dos -crlf" > .gitattributes
>    git add .gitattributes
>    git commit -m "add attributes"
>    echo "dos eol=crlf" > .gitattributes
>    git read-tree --empty   # Clean index, force re-scan of working directory
>    git add dos

This is not advisable as a general suggestion, as in a real life (as opposed to a toy example) there will be paths other than this 'dos' thing in the working tree. Perhaps replace "git read-tree --empty" with "git rm -f --cached dos" or something like that that limits its damage would prevent mistakes better.

>    git add .gitattributes
>    git commit -m "set eol attribute instead"
>    git ls-files --eol
Previous: Ben BoeckelNext: Ben Boeckel
Message 6 of 15 in “Cannot checkout after setting the eol attribute”
  1. Ben BoeckelAug 22, 2017
  2. Torsten BögershausenAug 22, 2017
  3. Ben BoeckelAug 22, 2017
  4. Torsten BögershausenAug 23, 2017
  5. Ben BoeckelAug 23, 2017
  6. Junio C HamanoAug 22, 2017
  7. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 23, 2017
  8. Ben BoeckelAug 23, 2017
  9. Torsten BögershausenAug 24, 2017
  10. Ben BoeckelAug 30, 2017
  11. Junio C HamanoAug 30, 2017
  12. Ben BoeckelAug 31, 2017
  13. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 30, 2017
  14. Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel, Aug 31, 2017
  15. Torsten BögershausenAug 31, 2017

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.