Changes view in IntelliJ continues to list files where the only difference are LF vs CRLF

Question

I have 2 files that won't go away in the Changes view. If I look at the diff, it just tells me the committed version has LF line endings and the local version has CRLF line endings. I'm working on a Mac and I understand linux based systems use LF line endings and Windows use CRLF. Is there someway I can just convert these 2 files so all the line endings are LF?

Thanks.

score 8 · Answer 1 · answered Sep 10 '15 at 08:37

8

I had the issue on Windows because I checked out the project using a Cygwin git.exe and IntelliJ used a git.exe from msysGit. Changing the git.exe under Settings -> Version Control -> Git -> Path to Git executable fixed the problem.

answered Sep 10 '15 at 08:37

Sonata

1,880
23
31

1

I also had this issue and this helped but I did have to revert all improper line endings so that the diff showed no more differences. – Scott Mar 23 '17 at 18:04

score 6 · Answer 2 · edited Jan 25 '18 at 02:05

6

In your case, you could:

convert those files
set core.autocrlf to input:
```
git config core.autocrlf input
```
reset it (make sure you don't have any work in progress)
```
git rm --cached -r .
git reset --hard
```

See more at "git replacing LF with CRLF".

edited Jan 25 '18 at 02:05

mehmet

6,023
3
31
42

answered Mar 27 '14 at 07:25

VonC

1,042,979
435
3,649
4,283

score 3 · Answer 3 · answered Nov 14 '17 at 14:35

3

Simple and quick solution to is - Shelve & Unshelve the changes. Works for me every time.

Shelving:

Unshelve:

answered Nov 14 '17 at 14:35

Johnny

10,849
11
61
105

score 1 · Answer 4 · answered Jun 07 '15 at 23:35

1

I had this issue on windows when repository was cloned using Cygwin (even with git config core.autocrlf true).

After re-cloning the repository with GitBash (configured as git config core.autocrlf true), the problem went away.

answered Jun 07 '15 at 23:35

coldserenity

5
1
1

truthseeker · Answer 5 · 2018-01-27T23:37:05.543

After a lot of trial and error, this following list finally works on windows:

IntelliJ settings->version control->git path to git executable should use the git.exe in c:\cygwin\bin
IntelliJ settings->version control->git ssh executable 'native'.
edit environment variables to your account on windows add to path: c:\cygwin\bin and c:\cygwin
get rid of the .idea in the project directory if it's already there. (very important !)
restart intellij, open the project directory again.

So now the local changes won't show the 'identical content' files, and the 'pull' and 'push' are all working from IntelliJ. And I don't have to go to cygwin to do the chore anymore.

If the project is being worked on both Linux and Windows, make sure the following setting is followed: Make sure you have this setting (git config -l) in the cygwin window: core.autocrlf=input

on linux in order for things to work properly you also have to have this setting as well: core.autocrlf=input

this is how to set it: git config --global core.autocrlf input

cheers!

score 0 · Accepted Answer · answered Jan 20 '15 at 19:54

0

git config core.autocrlf true

did the trick in my case, see https://www.jetbrains.com/idea/help/handling-lf-and-crlf-line-endings.html

answered Jan 20 '15 at 19:54

Tim Büthe

58,799
16
82
126

score 0 · Answer 7 · answered Aug 03 '17 at 08:36

There seems to be an issue when you git clone the repository via Cygwin git executable and IntelliJ uses the git exectuable at C:\Program Files\Git\bin\git.exe.

I solved this by cloning the project again via intellij (ctrl-shift-a : "check out from version control" -> Git).

Now everything seems to be in order and I can't see any changes until Version Control.

Changes view in IntelliJ continues to list files where the only difference are LF vs CRLF

7 Answers7