Make Git "LF will be replaced by CRLF" warnings go away

Question

I have setup Git so it doesn't commit inconsistent line endings. The problem with that is a whole pile of files appear modified even though they are not. What do I type to make these files have the line endings fixed on the local side?

# git checkout dev M   src/au/policy/dao/EmailQueue.java M   src/au/policy/dao/EmailQueueFactory.java M   src/au/policy/dao/PolicyPublisher.java Already on 'dev'  # git diff warning: LF will be replaced by CRLF in src/au/policy/dao/EmailQueue.java warning: LF will be replaced by CRLF in src/au/policy/dao/EmailQueueFactory.java warning: LF will be replaced by CRLF in src/au/policy/dao/PolicyPublisher.java 

This is what I added to my git config file which seems to do what I intended aside from this issue:

autocrlf = true 

Answer 1

This might happen if you change core.autocrlf config variable (if I understand your problem correctly).

If you are at clean state, i.e. just after commit, and you don't have uncomitted changes, forced re-checkout and removing index should do the trick:

The below command git reset --hard HEAD will make your current branch to point to the latest commit and all uncommitted code will be lost. Make sure to commit the code or take the backup

$ rm .git/index $ git reset --hard HEAD 

That, I think, would sync both working area files, and the index (staging area) to follow crlf settings.

Answer 2

I had this problem when creating new Xcode project. My solution for this problem:

In terminal write

$: git config --global --edit 

Then in git config file change safecrlf to false. My settings:

[core]     autocrlf = input     safecrlf = false 

I know git have cmd line tools for this but they don't work for me. And then Xcode create git repos without any problem.