Re: CRLF problems with Git on Win32

From: Steffen Prohaska <prohaska-wjoc1khpmeg@public.gmane.org>
Date: Jan 9, 2008, 12:45 UTC
Message-ID: <019B1C82-27BF-4B6B-981D-5498D31B5DD3@zib.de>
In-Reply-To: <alpine.LSU.1.00.0801091100401.31053-OGWIkrnhIhzN0uC3ymp8PA@public.gmane.org>

On Jan 9, 2008, at 12:03 PM, Johannes Schindelin wrote:

Show 28 quoted lines

> On Tue, 8 Jan 2008, Steffen Prohaska wrote:
>
>> On Jan 8, 2008, at 8:47 PM, Junio C Hamano wrote:
>>
>>> I think the project can mark text files as text with attributes  
>>> and if
>>> the port to the platform initialized core.autocrlf appropriately for
>>> the platform everything should work as you described.
>>>
>>> At least that is how I read the description of `crlf` in
>>> gitattributes(5).
>>
>> But we do not want to mark a file as text but tell git to run its
>> auto-detection and use the local default line endings.  But for
>> different projects we do not even want to run the auto-detection, but
>> leave the files as is.
>
> Probably the best thing would be to default to crlf=true, and then  
> have a
> .gitattributes file like this in your project:
>
> -- snip --
> *.am -crlf
> -- snap --
>
> (Did I guess right about the file extension? But why do you want to  
> check
> in huge 3D stacks? Ah, of course, for test cases.)

Yes, thanks ;)

For now, this is the right thing to do. However, our file format and the application does not depend on the extension. A a long term solution, I'll fix our file format header to include '\0' if the file is binary.

	Steffen