How can I disable diff in line separators in IntelliJ IDEA?

Question

I'm using Intellij IDEA 14 on Windows and Git as VCS on Unix server. The line separator in Windows is CLRF (\r\n) and LF (\n) in Unix. In Git, I'm using config --global core.autocrlf input. This will translate all CRLF's to LF's upon commit.

When I'm using "Reformat code" option on well-formatted file, IDEA marks files as changed and shows diff in line separators only.

Right mouse button on changed file -> Git -> Compare with Latest Repository Version

How can I disable that in IDEA?

Similar: https://stackoverflow.com/questions/35503036/git-and-intellij-lines-separator-issue — Vadzim, Jun 16 '17 at 20:54

score 30 · Answer 1 · answered Nov 14 '14 at 09:40

30

In the bottom right of your window, change [CRLF] to [LF]

answered Nov 14 '14 at 09:40

Peter Lawrey

525,659
79
751
1,130

2

but it shows diff in external tool (ex, Git Extensions) as empty changed file and I can't commit this file. – avfrolov Nov 14 '14 at 09:46
Hmm I use git inside intellij. It's much simpler to use imho. – Peter Lawrey Nov 14 '14 at 09:57
5

Global setting: https://www.jetbrains.com/help/idea/2017.1/configuring-line-separators.html – Vadzim Jun 16 '17 at 20:40

score 20 · Answer 2 · answered Nov 19 '17 at 16:03

I'm also developing on windows and Because our servers are powered by Linux and all the code has to base on Linux I have preferred to change all my files to LF instead of CRLF.

from git command line:

git config --global core.autocrlf false

i'm working with intellij idea so it's quite easy:

1) File --> settings --> editor --> code style: (for any new file will be created)

a. Scheme : default

b. Line separator: unix and os x (\n)

2) mark the root of the project --> file --> line separator --> LF unix and os x (\n) (for exist files)

Remark: you can also use apps like dos2unix.exe or some other scripts.

than I did using my command line: (you can do this also from the idea)

git commit -m "bla bla"
git add .
git push origin master

since then, I didn't got those warnings

just setting the config didn't change the working tree, pulling didn't either, so i had to clone the repository, and then the line separators were fixed. — chorn, Jul 10 '19 at 08:27

score 6 · Answer 3 · edited Jun 07 '22 at 06:41

6

If you came to this thread like me seeking an answer as to why your unit test (JUnit) fails on comparing generated JSON (or any other structure that contains line separators) with one written by hand, you should replace \n by \r\n (for Windows) in your string. The instructions given above don't work for this case.

edited Jun 07 '22 at 06:41

Pang

9,564
146
81
122

answered Apr 16 '20 at 10:02

Roman Gorbatenko

111
1
4

Thanks dude, that's exactly why I came for :D – Zopy Apr 23 '20 at 09:05

Evgene · Answer 4 · 2022-12-28T15:14:24.533

1

select folder -> File -> File Properties -> Line Separator -> LF

All files will be markd as changed.

Make regular commit with line separator changes ounly. It will fail but changed marks will disappear.

New files will inherit folder property.

edited Dec 28 '22 at 15:14

answered Dec 12 '22 at 11:40

Evgene

446
4
8

score 0 · Answer 5 · answered Feb 08 '18 at 06:12

0

In Intellij 17.3, you can select in the "Compare by" combobox in the compare window whether you want to compare 'Binary content' or 'Text'. In the second case CRLF and LF are not shown as "different".

answered Feb 08 '18 at 06:12

Hubert Schumacher

1,683
1
16
25

Which compare window do you mean? – Peter Sep 03 '21 at 16:44

Alex · Answer 6 · 2019-12-17T16:48:09.973

-2

Create parser.py in the same dir. Change the name and run. Enjoy))

with open('./file_to_fix.py', 'r') as f:
    a = f.read()

with open('./file_to_fix.py', 'w') as f:
    # for i in a.split('\r\n'):
    #     f.write(i)
    aa = a.replace('\r\n', '\n')
    f.write(aa)

edited Dec 17 '19 at 16:48

answered Dec 17 '19 at 16:36

Alex

37
4

How can I disable diff in line separators in IntelliJ IDEA?

6 Answers6

Linked