From: Pete B. <pb...@gm...> - 2010-12-05 20:24:07
|
On 2010.12.05 19:32, Michael Plante wrote: > I'm seriously beginning to think this is the root of my problem. I think > both Pete's and my working copies have CRLF's, but my repo has LF's and > Pete's has CRLF's. I'm not 100% sure, but does that seem like a reasonable > guess to you? If you didn't apply [1], which also converted all the project files in the repo then, yes, as I tried to point out, your files would still be LF'd in the repo (while mine are CRLF'd). Another possibility is that git is not smart enough to detect that if a .gitattributes is part of a commit, it should create it first and apply its settings (and I guess I should have broken my commit there, as I did break it up for official), so even as the patch operation should have converted the files in your repo, it didn't, and you would have had to unix2dos them right after. Regards, /Pete [1] http://git.libusb.org/?p=libusb-pbatard.git;a=commit;h=b5820d34ad6fd3fa719d861daa58e25789ccf232;js=1 |