[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git on Windows (was: Re: git not fetching from origin...)
From: |
Carl D. Sorensen |
Subject: |
Re: git on Windows (was: Re: git not fetching from origin...) |
Date: |
Tue, 26 May 2009 06:54:44 -0600 |
On 5/26/09 2:57 AM, "Trevor Daniels" <address@hidden> wrote:
>
>
> Johannes Schindelin Tuesday, May 26, 2009 9:37 AM
>
>>>>>>> 4) Recommend a CR/LF behavior.
>>>>>>> Use Unix style line endings?
>>>>>>> Use Windows style line endings?
>>>>>>> Commit line endings as they are?
>>>>>>
>>>>>> Again, I think the default is sane here (unless somebody
>>>>>> fscks up and
>>>>>> commits files with CR/LF line endings).
>>>>>
>>>>> Or Mac line endings.
>>>>>
>>>>> It is essential to use the default in my opinion,
>>>>> so I'll make this clear. Perhaps I should also
>>>>> mention that any files pushed (by others) to
>>>>> remote/origin/master with Mac line endings screw
>>>>> up a Windows respository when pulled. The only
>>>>> way out, as far as I have been able to discover,
>>>>> is for someone with write access to fix them
>>>>> immediately.
>>>>
>>>> Mac line endings will pretty much screw everybody, including
>>>> Mac users, as
>>>> Git's diff engine (which is responsible for merging, too)
>>>> relies on LF
>>>> being the last byte in every line.
>>>>
>>>> But then, I am not aware of anyone managing to get LilyPond to
>>>> run on
>>>> MacOS < 10.*, and on MacOSX, the native line ending is LF.
>>>
>>> Even so, Mac line endings have found their way
>>> into Lily's remote/origin/master several times
>>> in the last couple of years. I thought only
>>> Windows was affected, as no one else seemed to be
>>> concerned about it. I fixed them as soon as
>>> they appeared.
>>
>> Oh... Well, you probably did not do much merging on these files as
>> long as
>> they were CR-only, I guess... ;-)
>
> Exactly so! The first time it happened was
> quite traumatic. Now I know what to do it's
> just a nuisance. Fortunately they show up in
> my repo as soon as I try to merge after fetching
> from remote, so I spot them right away and push a
> fix.
I suppose that CR-only endings might come from me, using a Mac with
Entourage as my email client. When I save a patch file from Entourage as
text, it shows up as CR-only endings.
When I make my own patches, they're Unix line endings.
Trevor, could you do a quick search for the fixes you've pushed, and
identify the patches that caused the problem?
Thanks,
Carl
- Re: git on Windows (was: Re: git not fetching from origin...), (continued)
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/25
- Re: git on Windows (was: Re: git not fetching from origin...), Trevor Daniels, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Trevor Daniels, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Trevor Daniels, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Mark Polesky, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Mark Polesky, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...),
Carl D. Sorensen <=
- Re: git on Windows (was: Re: git not fetching from origin...), Johannes Schindelin, 2009/05/26
- Re: git on Windows (was: Re: git not fetching from origin...), Carl D. Sorensen, 2009/05/26
- Re: Mac OS Line endings (was Re: git on Windows (was: Re: git not fetching from origin...)), Carl D. Sorensen, 2009/05/26
- Re: git not fetching from origin..., Johannes Schindelin, 2009/05/25
- Re: git not fetching from origin..., Patrick McCarty, 2009/05/25
- Re: git not fetching from origin..., Carl D. Sorensen, 2009/05/25
- Re: git not fetching from origin..., Patrick McCarty, 2009/05/25
Re: git not fetching from origin..., Mark Polesky, 2009/05/24