From: Michael P. <mic...@gm...> - 2010-12-06 11:36:19
|
Peter Stuge wrote: >> Changing crlf settings in git never makes it change what is checked >> out. This causes significant confusion if testing settings back and >> forth. I have also seen this in my testing. If someone wants to test >> my suggested .gitattributes above, please make sure to do a lot of >> checkouts in order to actually exercise the code in git that does >> conversion. I'm not sure if I understand which "crlf settings in git" you're referring to: those in .gitattributes or those in the git config? If the latter, ok. But if the former, this cannot be true: >> Changing crlf settings in git never makes it change what is checked >> out. As I mentioned, changing crlf settings in .gitattributes SOMETIMES changes what's checked out. But maybe that's a consequence of master having the files moved to a different directory, which tricks git into re-checking? As a wild guess, I'm wondering if the following would help, in your estimation: http://help.github.com/dealing-with-lineendings/ key line: $ git rm --cached -r . In another place, I saw something similar recommended: $ rm .git/index && git reset Do you think either of those would help our tests to go more predictably, or do those correct different issues from what we're seeing? >> The commit identified by Michael introduces the eol attribute, and I >> prefer taking advantage of that rather than setting -text on the >> files So would you say that that commit intentionally introduces the behavior I saw, or is the behavior I saw an unintended side effect? Thanks, Michael |