File keeping listed as changed

Developers forum for Univeral Media Server-related development (only for programmers)
Post Reply
spider910
Posts: 5
Joined: Sat Mar 10, 2018 6:09 am

File keeping listed as changed

Post by spider910 » Mon Apr 23, 2018 2:58 pm

Since some weeks ago, I had a very recurring problem: a file constantly is being listed as modified (completely modified, in fact), no matter what I tries. I don't touch it, but even stashing, resetting, uninstalling GitHub and all repository files, etc, the file remais as modified. The file in question is CustomTabbedPaneUI.java. There is something I can do to get rid of this problem? Sometimes it delays my merges, because I can't stash/cancel it.

It appears to be a line ending problem, but I'm really not sure.

User avatar
SubJunk
Lead Developer
Posts: 2635
Joined: Sun May 27, 2012 4:12 pm

Re: File keeping listed as changed

Post by SubJunk » Mon Apr 23, 2018 6:52 pm

Ah yeah I've seen this, you can change the line ending setting in Git to make it play nice with our line endings

User avatar
Nadahar
Developer
Posts: 1199
Joined: Tue Jun 09, 2015 5:57 pm

Re: File keeping listed as changed

Post by Nadahar » Mon Apr 23, 2018 9:25 pm

I have configured my Git to only alter line endings at commits, not at check-out ("core.autocrlf" = "input"). This has worked well for me on Windows since it makes sure no conversion takes place on checkout and I don't get this problem. At the same time my commits use Unix-style (LF only) line-endings, which is the only reasonable thing to do.

I wish Windows-style line endings (CR + LF) would go down in history as a big mistake and be forgotten about. Apple has already abandoned "their" line-endings (CR) and now use (LF) as well.

See https://stackoverflow.com/questions/104 ... g-settings

Post Reply