core.autocrlf and merge conflict output
From: Edward Z. Yang <hidden>
Date: 2016-06-15 22:44:48
-----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-----