Re: [Libusb-devel] CRLF in files checked out on Windows

[Michael P. <mic...@gm...>]

Pete Batard wrote:
>> On 2010.12.07 23:44, Michael Plante wrote:
>> > Ah, Pete, tell me if this would help:
>> >
>> > 1. put two trees on your Linux box, one with autocrlf=false locally,
and one
>> > with it true.
>> >
>> > 2. Set the one with autocrlf=false to pull from the one with it true.
>> >
>> > 3. Copy files between the one with autocrlf=true and Windows.
>> >
>> > Would that help you out?  I think that *avoids* the need to have
filesystems
>> > visible one way or the other (SMB, NFS, etc), unlike the other option I
>> > suggested.
>>
>> I appreciate the suggestion, but I still need to
>> - commit changes I want to test to a branch that's different than my
>> master (so work on a new master-dev branch set to a private remote I set
>> on my Linux machine - don't really want my testing to be public)

No, this is different from the other suggestion I offered in that regard.
You still work on your master branch in Windows, but you don't push from
Windows until you've finished testing.  Then you can reset --hard on Windows
with no consequences.


>> - push (Windows)

No.


>> - pull (Linux) before I can test

Yes.  Between the two Linux repositories.  Not to the network.  Therefore,
no "oops!" commits, as you put it, yet you still work on whichever branch
you were on.

Michael