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

Re: crlf with git-svn driving me nuts...

From
Avery Pennarun <apenwarr@gmail.com>
Date
Apr 16, 2008, 20:20 UTC
Message-ID
<32541b130804161320w42c68bc2p9d838dc127a57027@mail.gmail.com>
In-Reply-To
<20080416200107.GG3133@dpotapov.dyndns.org>
On 4/16/08, Dmitry Potapov <dpotapov@gmail.com> wrote:
>  In this case, you already have a file with the wrong ending,
>  so file.txt will be shown as changed now, because if you commit
>  it again then it will be commited with <LF>, which should have
>  been done in the first place.
[...]
Show 5 quoted lines
> If you do not want problems, you should use core.autocrlf=true
>  on Windows. Then all text files will be stored in the repository
>  with <LF>, but they will have <CR><LF> in your work tree.
>  Users on *nix should set core.autocrlf=input or false, so they
>  will have <LF> in their work tree.

Alas, the subject of this thread involves git-svn, and the typical git-svn user is someone who has no way of rewriting the existing history in their svn repositories. Thus, files *will* be in the repository that have the wrong line endings, and (as you noted) git just gets totally confused in that case.

Nigel's example showed a few situations where git *thought* the file had changed when it hadn't, and yet is incapable of checking in the changes.

If all I had to do was checkout (thus converting everything to LF), and then "git commit -a" to check in all the corrected files, then git-svn would make one giant, very rude checkin to svn, and my problems would be largely solved. However, this does not seem to be possible due to the problems you noted ("you are going to have problems now").

Have fun,
Avery
Previous: Dmitry PotapovNext: Dmitry Potapov
Message 3 of 19 in “crlf with git-svn driving me nuts...”
  1. Nigel MagnayApr 16, 2008
  2. Dmitry PotapovApr 16, 2008
  3. Avery PennarunApr 16, 2008
  4. Dmitry PotapovApr 16, 2008
  5. Nigel MagnayApr 16, 2008
  6. Martin LanghoffApr 16, 2008
  7. Avery PennarunApr 16, 2008
  8. Dmitry PotapovApr 16, 2008
  9. Avery PennarunApr 16, 2008
  10. Nigel MagnayApr 16, 2008
  11. Dmitry PotapovApr 17, 2008
  12. Avery PennarunApr 17, 2008
  13. Nigel MagnayApr 17, 2008
  14. Dmitry PotapovApr 17, 2008
  15. Nigel MagnayApr 17, 2008
  16. Dmitry PotapovApr 17, 2008
  17. Nigel MagnayApr 17, 2008
  18. Dmitry PotapovApr 17, 2008
  19. Steffen ProhaskaApr 17, 2008

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.