General :: Maintainance :: Git

[blaggacao]

I notices on running the following statement git diff -S fields. f643660f169a26d8c2e71d7496c981bc2c171421 that a lot of files have the line ending changed to windows style (^M). This makes this otherwise very powerful command quite useless.

(Hint I want to track any changes on lines which contains "fields." in order to track database alteration and help synching my own development with the odoo one)

Please consider this article: https://help.github.com/articles/dealing-with-line-endings#per-repository-settings

...and resetting all github indices. Thanks

@odony I first posted in community list, but feel that here is the better place to adress this. Thanks.
@fpodoo Fabien, I ping you because this would probably have to be ruled from a rather high level of decision making within the organization. Thanks.

[blaggacao]

Related postings: https://lists.launchpad.net/openerp-community/msg06749.html

[lepistone]

👎 Please, before cross-posting everywhere, try to find a specific issue: which files are problematic? Thanks for your comprehension

[blaggacao]

@lepistone
The reason for moving the post is, that it tranformed from a question towards an issue within the core, so this is the right place (as evolved) to adress it, not the communtiy list. Once the right place is determined, I prefer linking discussions in order to help people route through information and context.

Do you consider this a bad issue? Or only a bad issue report? If the one or the other, can you be more specific? Thanks for your re-evaluation and your feedback.

If you read it carefully, I don't think it lacks of specificity, as specificity is bound to a context. This issue has no file specific context.

If you want, we can continue this off-topic discussion privately: david@elaleman.co, I'd be glad to hear your opinion!

[lepistone]

Hi @blaggacao.

Let me insist on my original question: which files are problematic and in what way? Before raising a general issue, I believe it is very important to track down what is the specific situation that triggered the problem.

I took the time do actually check that, and I found out that in all the odoo repository there are 6 files with Windows line endings:

• 3 in the "windows" directory. This is correct, no problem with those.
• 3 in the "pypdf", which is a copy-pasted library, so again, I don't think we should change those either.

The default setting in git is already sane enough: apart from those 6, we have unix line endings. People in unix do not get any conversion, while people on windows get git's default automatic one.

I did actually try the process you mention https://help.github.com/articles/dealing-with-line-endings#per-repository-settings and the only files that get changed are those 6. For that reason I personally think the situation we have is OK already. I could change my mind if we find some specific problem that could be fixed that way.

I also tried to do the "git diff -S" command you mention and I don't get any problem on line endings on my machine. This is actually an interesting point, and merits a question on help.odoo.com. But please, before assuming everythings needs to be changed, explain what you are trying to do and that error you get.

I hope that explains my position, thank you anyway!

[blaggacao]

@lepistone , thanks, indeed it does, and thank you for your support in analysing this, which contains tools and knowledge (!) that are not to my disposition at the moment...

Actually, what disouraged me from digging deeper with my propriate means is, that this gitattribute setting could be considered "officially recommended". (I read something alike somwhere)

I think it is certainly not (!) priority, but if this "official recomendation" helps to avoid "eventualities", I think IMHO it should be queued for action here.

Thanks again for your time, your analysis and your opinion! Regards, David

<hr>

off-topic:
My machine works like this:
The code resides in windows and is then propelled (vagrant) to a linux vm and run remotely, git diff was run on that virtual machine... Actually, the posts you found in google about git and eol don't make you think this could be the issue.. I'll play arround a little bit with that. 😄

[blaggacao]

If someone is starting with git and hits this occasionally: http://www.gitguys.com/