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

Re: CRLF, LF ... CR ?

From
Jeff King <peff@peff.net>
Date
Sep 13, 2012, 15:43 UTC
Message-ID
<20120913154309.GB726@sigill.intra.peff.net>
In-Reply-To
<1347550490.24469.54.camel@drew-northup.unet.maine.edu>
On Thu, Sep 13, 2012 at 11:34:50AM -0400, Drew Northup wrote:
Show 6 quoted lines
> > I've read that git supports two different line endings; either CRLF or LF, but it does not support CR.
> > Would it make sense to add support for CR (if so, I hereby request it as a new feature) ?
> 
> Even if Git can't do CRLF/LF translation on a file it will still store
> and track the content of it it just fine. In fact you probably want
> translation completely disabled in this case.

Yeah. If the files always should just have CR, then just don't ask git to do any translation (by not setting the "text" attribute, or even setting "-text" if you have something like autocrlf turned on globally), and it will preserve the bytes exactly. I suspect diffs will look nasty because we won't interpret CR as a line-ending, though.

Do the files actually need line-by-line diffing and merging? If not, then you are fine.

If so, then it would probably be nice to store them with a canonical LF in the repository, but convert to CR on checkout. Git can't do that internally, but you could define clean/smudge filters to do so (see the section in "git help attributes" on "Checking-out and checking-in"; specifically the "filter" subsection).

-Peff
Previous: Drew NorthupNext: Jens Bauer
Message 3 of 18 in “CRLF, LF ... CR ?”
  1. Jens BauerSep 13, 2012
  2. Drew NorthupSep 13, 2012
  3. Jeff KingSep 13, 2012
  4. Jens BauerSep 13, 2012
  5. Jens BauerSep 13, 2012
  6. Jeff KingSep 13, 2012
  7. Jens BauerSep 13, 2012
  8. Johannes SixtSep 13, 2012
  9. Jens BauerSep 13, 2012
  10. Erik Faye-LundSep 13, 2012
  11. David AguilarSep 14, 2012
  12. Jens BauerSep 14, 2012
  13. Junio C HamanoSep 14, 2012
  14. David AguilarSep 26, 2012
  15. Jens BauerSep 26, 2012
  16. Jens BauerSep 26, 2012
  17. Junio C HamanoSep 27, 2012
  18. Jens BauerSep 27, 2012

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.