From: Pete B. <pb...@gm...> - 2010-12-07 20:41:12
|
On 2010.12.07 20:02, Peter Stuge wrote: > Pete Batard wrote: >> * eol=lf / eol=crlf and running the risk of having it overridden and >> people not getting lf'd files if they use MSYSgit > > I have always written: text eol=lf > > That's two attributes. I'm sorry if I should have pointed that out > more explicitly - I thought I had already made it clear. > > Without text in .gitattributes there are certainly many settings that > influence git conversion, but text eol=lf is unambiguous. Oops. I hadn't realized you could combine two such attributes (how much more non obvious ways of screwing line conversion are there that git users need to be aware of?). That's probably why I couldn't get eol=lf alone to work then (I'll test "text eol=lf" soon) > Allow me to repeat my argument: (for the fourth time, is it?) > > The files are text, so they should be marked as such. The problem I have with text is that it's just a denomination. It was called "crlf", then it was called "text", and it could be changed tomorrow. Let's say this attribute is called "conversion_option_1" (or anything you want, but not "text"), where is the link between having a text file, and wanting to use "conversion_option_1"? It's not because an option is called with a specific name that one should blindly assume that it should apply to all elements that can be qualified as "name", yet you seem to keep arguing that the name of the option is important. How does the designation matter here? Maybe I missed something, but was does "text" actually do (apart from telling git that it might want to apply EOL conversions on it)? The doc states: ---------------------------------------------------------------------- Setting the text attribute on a path enables end-of-line normalization and marks the path as a text file. ---------------------------------------------------------------------- If the second part is related to your text files having to be set as "text" (rather than using the option "text", a.k.a. "crlf", should apply the conversion options that we want to use, on these files, which also happen to be text files), what does "marks the path as a text file" mean? It looks unrelated to enabling EOL conversion since this is specified separately, but since it's mentioned as an extra attribute, I'd expect it to do something. So far I haven't been able to find in the documentation what "marking the path as a text file" does, while I assume that this is related to your it's a text file so it should be set as "text"? Or does it just flip a flag and that's it? > Maybe it was just configured wrong. There are a fair number of > settings to take into account, and it certainly took me several > readings of documentation, and some testing, to get a grip on git > in this respect. Fair enough. > Maybe spent half an hour on it. Followed by a few > days of your FUD. Please test, and certainly let us know if there > is an actual problem with what I suggested. Will do. Regards, /Pete /Pete |