{"thread":{"id":"14092","subject":"core.autocrlf and merge conflict output","startedAt":"2008-06-22T22:08:59Z","lastAt":"2008-06-23T02:23:59Z","messageCount":6,"participants":["Edward Z. Yang","Junio C Hamano","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"80647","messageId":"g3miho$se5$1@ger.gmane.org","threadId":"14092","inReplyTo":null,"subject":"core.autocrlf and merge conflict output","fromName":"Edward Z. Yang","fromEmail":"edwardzyang@thewritingpot.com","sentAt":"2008-06-22T22:08:59Z","receivedAt":"2008-06-22T22:08:59Z","isPatch":false,"sender":{"key":"edwardzyang@thewritingpot.com","avatar":"https://gravatar.com/avatar/a805a0a3c1d7d36e7fe22270596e4d812723652933c59cac267e67c79126fdd0?d=mp&s=160"},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nApparently, the conflict information Git writes to the working copy\nduring merge doesn't respect core.autocrlf, magically converting files\nto LF and causing problems when you try to commit the files, when\ncore.safecrlf is on.\n\nI'm in the process of making a patch, but I'm having difficulty getting\nbuiltin-merge-file.c and convert.c to play together. Part of the problem\nis the lack of documentation in convert.c, which I'd also like to fix\n(but in a different patch).\n\nSo, here's an appeal to the Git gods:\n\n* Should I even bother trying to document this? While good docs are\nalways a definite plus, poor documentation can hurt code.\n\n* Would crlf_to_worktree (apparently an internal function) or\nconvert_to_working_tree be more appropriate for this task?\n\n* Where can I get a sensible value for *path in convert.c from\nbuiltin-merge-file.c?\n\nThanks!\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.7 (MingW32)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niD8DBQFIXs17qTO+fYacSNoRAuAEAJ9LekfdUzU8WjbYxdhDOLaUfN67HACgg6gR\n3kpT/5CbV3X7bbfkwJFDpAI=\n=lega\n-----END PGP SIGNATURE-----\n"},{"id":"80660","messageId":"7vy74xj7ww.fsf@gitster.siamese.dyndns.org","threadId":"14092","inReplyTo":"g3miho$se5$1@ger.gmane.org","subject":"Re: core.autocrlf and merge conflict output","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-23T00:45:35Z","receivedAt":"2008-06-23T00:45:35Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Edward Z. Yang\" <edwardzyang@thewritingpot.com> writes:\n\n> Apparently, the conflict information Git writes to the working copy\n> during merge doesn't respect core.autocrlf,...\n\nIs this an old news before 249c61a (merge-recursive: respect core.autocrlf\nwhen writing out the result, 2008-06-09) happened?\n"},{"id":"80664","messageId":"g3mvbh$mmj$1@ger.gmane.org","threadId":"14092","inReplyTo":"7vy74xj7ww.fsf@gitster.siamese.dyndns.org","subject":"Re: core.autocrlf and merge conflict output","fromName":"Edward Z. Yang","fromEmail":"edwardzyang@thewritingpot.com","sentAt":"2008-06-23T01:47:36Z","receivedAt":"2008-06-23T01:47:36Z","isPatch":false,"sender":{"key":"edwardzyang@thewritingpot.com","avatar":"https://gravatar.com/avatar/a805a0a3c1d7d36e7fe22270596e4d812723652933c59cac267e67c79126fdd0?d=mp&s=160"},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nJunio C Hamano wrote:\n> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf\n> when writing out the result, 2008-06-09) happened?\n\nApparently, yes. :o) Thus are the perils of working off a \"downstream\"\nbranch. I'll go bug the git/mingw/4msysgit.git maintainers to get this\nchange merged in. Thanks!\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.7 (MingW32)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niD8DBQFIXwC4qTO+fYacSNoRAi8RAJ4/ZF0C0XB9QSPgCnQYae/33YSRUgCff/y5\n5Dd9vy/pQQsNJbyQ+xfc4lY=\n=fyGn\n-----END PGP SIGNATURE-----\n"},{"id":"80665","messageId":"7vk5ggkjan.fsf@gitster.siamese.dyndns.org","threadId":"14092","inReplyTo":"g3mvbh$mmj$1@ger.gmane.org","subject":"Re: core.autocrlf and merge conflict output","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-06-23T01:54:24Z","receivedAt":"2008-06-23T01:54:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Edward Z. Yang\" <edwardzyang@thewritingpot.com> writes:\n\n> Junio C Hamano wrote:\n>> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf\n>> when writing out the result, 2008-06-09) happened?\n>\n> Apparently, yes. :o) Thus are the perils of working off a \"downstream\"\n> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this\n> change merged in. Thanks!\n\nDid cherry-picking that particular commit locally fixes the issue for you?\n"},{"id":"80667","messageId":"alpine.DEB.1.00.0806230259140.6439@racer","threadId":"14092","inReplyTo":"g3mvbh$mmj$1@ger.gmane.org","subject":"Re: core.autocrlf and merge conflict output","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-06-23T02:00:01Z","receivedAt":"2008-06-23T02:00:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sun, 22 Jun 2008, Edward Z. Yang wrote:\n\n> Junio C Hamano wrote:\n> > Is this an old news before 249c61a (merge-recursive: respect \n> > core.autocrlf when writing out the result, 2008-06-09) happened?\n> \n> Apparently, yes. :o) Thus are the perils of working off a \"downstream\" \n> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this \n> change merged in. Thanks!\n\nFunny.  And I thought 1.5.6 contained that patch...  Because 1.5.6 was \nmerged by Steffen recently, and announced on both the msysgit list as well \nas this one.\n\nCiao,\nDscho\n"},{"id":"80668","messageId":"485F093F.8020300@thewritingpot.com","threadId":"14092","inReplyTo":"alpine.DEB.1.00.0806230259140.6439@racer","subject":"Re: core.autocrlf and merge conflict output","fromName":"Edward Z. Yang","fromEmail":"edwardzyang@thewritingpot.com","sentAt":"2008-06-23T02:23:59Z","receivedAt":"2008-06-23T02:23:59Z","isPatch":false,"sender":{"key":"edwardzyang@thewritingpot.com","avatar":"https://gravatar.com/avatar/a805a0a3c1d7d36e7fe22270596e4d812723652933c59cac267e67c79126fdd0?d=mp&s=160"},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nJohannes Schindelin wrote:\n> Funny.  And I thought 1.5.6 contained that patch...  Because 1.5.6 was \n> merged by Steffen recently, and announced on both the msysgit list as well \n> as this one.\n\nAnd I'm wrong once again. My git checkout was on a detached head and\nwasn't updating (apparently, I'm no good at reading error messages).\nSwitching back to master, pulling and then re-compiling fixed it.\n\nWhile 99% of this is my fault, there might be a bug in netinstall.\nHowever, I'm going to take that one to the msysgit list.\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.7 (MingW32)\nComment: Using GnuPG with Mozilla - http://enigmail.mozdev.org\n\niD8DBQFIXwk/qTO+fYacSNoRAkIhAJ9LU6jH5ThQbu0tSjmkbp7ynEyh5wCdHvbJ\npFVPllbiXjfLrgEYuY+uVlM=\n=ZxbH\n-----END PGP SIGNATURE-----\n"}]}