How to normalize working tree line endings in Git?

Question

I have cloned a repository that had inconsistend line endings. I have added a .gitattributes that sets the text attribute for the files I want to normalize. Now when I commit changes I get the message:

warning: CRLF will be replaced by LF in FILE. The file will have its original line endings in your working directory. 

How can I make git normalize my working copy of the file for me? Preferably I would like git to normalize the entire working tree.

Answer 1

For those using v2.16 or better, you can simply use:

git add --renormalize .  # Update index with renormalized files git status               # Show the files that will be normalized git commit -m "Introduce end-of-line normalization" 

These directions are straight out of the gitattributes. For older versions, the docs (prior to v2.12) provide a different answer:

rm .git/index     # Remove the index to force git to git reset         # re-scan the working directory git status        # Show files that will be normalized git add -u git add .gitattributes git commit -m "Introduce end-of-line normalization" 

Do this sequence after you have edited .gitattributes.

Update

It appears some users have had trouble with the above instructions. Updated docs for gitattributes (2.12 to 2.14) shows a new set of instructions (after editing the .gitattributes files):

git read-tree --empty   # Clean index, force re-scan of working directory git add . git status        # Show files that will be normalized git commit -m "Introduce end-of-line normalization" 

Thanks to @vossad01 for pointing this out.

Also, with either solution the files in your working copy still retain their old line endings. If you want to update them, make sure your working tree is clean and use:

git rm --cached -r . git reset --hard 

Now the line endings will be correct in your working tree.

Answer 2

With Git client 2.16 and higher there is now a much simpler way to do this. Just use:

git add --renormalize . 

Note: it's better to do this with a clean workspace. For details, see:

• https://git-scm.com/docs/gitattributes#_end_of_line_conversion
• https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings#refreshing-a-repository-after-changing-line-endings