From: Michael P. <mic...@gm...> - 2010-12-06 01:27:57
|
Pete Batard wrote: >> On 2010.12.06 00:36, Michael Plante wrote: >> >>> I can't reproduce this in Windows, though. Even more frustrating... >> > >> > Well, it's clearly recent. I upgraded from msysgit 1.6.5.1-preview20091022 >> > to 1.7.3.1-preview20101002, and now I *can* reproduce it on Windows. >> >> OK. Do you suspect this (potential) bug to be the cause of your 2010.08 >> issue then? As far as being unable to do what I needed? Possibly. I remember seeing bizarre behavior and doubting my own memory of what had just happened. Funny thing is that 1.6.5.1 spits out LF-only in both situations, whereas 1.7.3.1 behaves like the 1.7.2.2 Linux build. Unless autocrlf is set, in which case 1.6.5.1 spits out CRLF-only. I haven't tested 1.7.3.1 in Windows with autocrlf yet. In short, if this observed behavior is changed to something more sane upstream, then I might have better luck fixing my repo. But, more importantly, I don't think we can go forward with eol=crlf until it's fixed. Regardless, it sounds like both Peter and Segher are bothered by having CRLF in the repo itself (i.e., the \r's that show up on gitweb for your repo), unless I'm misunderstanding them. I'm not sure how to proceed now. Options I see: 1) keep your repo as-is, and I spend some time trying to fix mine again with the new version now that I know what to look out for. 1a) I succeed. If it didn't take long, great. If it took a long time and Peter decides he doesn't like what you've done, I've wasted my time twice, once forward, and once reverting. 1b) I fail again. 2) we switch to eol=crlf after git is fixed (assuming it is a bug) and require people to upgrade...possible or not? Forget for a second whether we should reasonably expect everyone to upgrade so quickly, and just pretend we can require people to upgrade...would this cause any problems in libusb.git itself if we wait that long? In essence, taking this option requires taking option 1 or 3 first, and then switching later. Dunno if that's a bad idea. 3) we take your compromise of dropping references to .ds? in .gitattributes and expect people to set autocrlf (which is incidentally set for you in the install wizard for msysgit anyway). Then what? I guess that's the least-bad option, but I'm not sure. Michael |