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

core.autocrlf and merge conflict output

From
Edward Z. Yang <edwardzyang@thewritingpot.com>
Date
Jun 22, 2008, 22:08 UTC
Message-ID
<g3miho$se5$1@ger.gmane.org>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Apparently, the conflict information Git writes to the working copy during merge doesn't respect core.autocrlf, magically converting files to LF and causing problems when you try to commit the files, when core.safecrlf is on.

I'm in the process of making a patch, but I'm having difficulty getting builtin-merge-file.c and convert.c to play together. Part of the problem is the lack of documentation in convert.c, which I'd also like to fix (but in a different patch).

So, here's an appeal to the Git gods:
* Should I even bother trying to document this? While good docs are
always a definite plus, poor documentation can hurt code.
* Would crlf_to_worktree (apparently an internal function) or
convert_to_working_tree be more appropriate for this task?
* Where can I get a sensible value for *path in convert.c from
builtin-merge-file.c?
Thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIXs17qTO+fYacSNoRAuAEAJ9LekfdUzU8WjbYxdhDOLaUfN67HACgg6gR 3kpT/5CbV3X7bbfkwJFDpAI= =lega -----END PGP SIGNATURE-----

Next: Junio C Hamano
Message 1 of 6 in “core.autocrlf and merge conflict output”
  1. Edward Z. YangJun 22, 2008
  2. Junio C HamanoJun 23, 2008
  3. Edward Z. YangJun 23, 2008
  4. Junio C HamanoJun 23, 2008
  5. Johannes SchindelinJun 23, 2008
  6. Edward Z. YangJun 23, 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.