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

Re: [PATCH v2] merge-recursive: respect core.autocrlf

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 9, 2008, 23:35 UTC
Message-ID
<alpine.DEB.1.00.0806100033350.1783@racer>
In-Reply-To
<7vprqqdwh7.fsf@gitster.siamese.dyndns.org>
Hi,
On Mon, 9 Jun 2008, Junio C Hamano wrote:
Show 18 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> >
> > 	On Mon, 9 Jun 2008, Junio C Hamano wrote:
> >
> > 	> Fairly straightforward fix, except that I suspect this needs to 
> > 	> be done only for regular files and not symlinks.
> > 	> 
> > 	> I think entry.c:write_entry() shows how this should be done.
> >
> > 	Right.  And the relevant clause is actually already there.  D'oh.
> 
> Well, you actually have "double d'oh".  "This ought to be a symlink but 
> the filesystem is lacking, so we instead write out what the readlink 
> from such a symlink would return" codepath should not 
> convert_to_worktree().

I actually thought about that a bit, and just assumed that the rest of the Git code respects autocrlf for "fake" symlinks.

IMO it makes no sense at all to write the textual symlink files without CR/LF when the user clearly asked for it with autocrlf = true. After all, it _is_ a text file then.

But yes, I tried to save some time and did not check.

Ciao, Dscho

Previous: Junio C HamanoNext: Marius Storm-Olsen
Message 11 of 26 in “Add testcase for merging in a CRLF repo, showing that conflict file is in LF only”
  1. Add testcase for merging in a CRLF repo, showing that conflict file is in LF onlyMarius Storm-Olsen, Jun 9, 2008
  2. Johannes SixtJun 9, 2008
  3. Marius Storm-OlsenJun 9, 2008
  4. Johannes SixtJun 9, 2008
  5. Marius Storm-OlsenJun 9, 2008
  6. 1/2 Add testcase for merging in a CRLF repoJohannes Schindelin, Jun 9, 2008
  7. 2/2 merge-recursive: respect core.autocrlfJohannes Schindelin, Jun 9, 2008
  8. Junio C HamanoJun 9, 2008
  9. merge-recursive: respect core.autocrlfJohannes Schindelin, Jun 9, 2008
  10. Junio C HamanoJun 9, 2008
  11. Johannes SchindelinJun 9, 2008
  12. 0/2 Respecting core.autocrlf when showing objectsMarius Storm-Olsen, Jun 10, 2008
  13. 1/2 Add testcases for verifying that staged files in a conflict are CRLF, when core.autocrlf = trueMarius Storm-Olsen, Jun 10, 2008
  14. 2/2 Ensure that objects shown in a core.autocrlf = true repo have CRLF EOLsMarius Storm-Olsen, Jun 10, 2008
  15. Johannes SchindelinJun 10, 2008
  16. Junio C HamanoJun 10, 2008
  17. Marius Storm-OlsenJun 11, 2008
  18. Jakub NarebskiJun 11, 2008
  19. Johannes SchindelinJun 11, 2008
  20. Marius Storm-OlsenJun 12, 2008
  21. Junio C HamanoJun 12, 2008
  22. J. Bruce FieldsJun 12, 2008
  23. Jakub NarebskiJun 12, 2008
  24. Junio C HamanoJun 12, 2008
  25. Jon LoeligerJun 12, 2008
  26. Marius Storm-OlsenJun 12, 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.