Skip to content

Cleanup: file permissions and line endings. #1498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Cleanup: file permissions and line endings. #1498

wants to merge 3 commits into from

Conversation

mslusarz
Copy link

@mslusarz mslusarz commented Jul 7, 2013

It does 2 things:

  • removes execute permissions from all non-executable files (txt, c, java, etc), which were accidentally committed
  • sets line ending attributes for the whole repo to "auto" - on Windows all text files will have Windows' line endings, on Linux - Linux'.

Second change - splitted into 2 commits - had to "rewrite" 294 files. It will probably bring some problems with merging, but they can be solved (*) by merging with git merge -s recursive -Xrenormalize (or -Xignore-space-at-eol or -Xignore-space-change)

( * http://stackoverflow.com/questions/861995/is-it-possible-for-git-merge-to-ignore-line-ending-differences )

mslusarz added 3 commits July 7, 2013 13:31
All those file patterns are not strictly needed. They just prevent git from guessing.
@mslusarz
Copy link
Author

BTW, you can regenerate last commit by touching all files and commiting the result.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants