16 Replies Last post: Apr 30, 2013 5:14 PM by Paul Bienick  
Paul Bienick Newbie 40 posts since
Nov 26, 2002
Currently Being Moderated

Mar 19, 2013 6:52 PM

git diff no longer works in Update Project Info tab

OS X 10.8.3

IntelliJ 12.0.4

When I pull the latest from github, the Update Project Info tab shows the files that have been updated, but when I CMD+D to diff any one of them, the diff window shows the same file on both sides and it says "no differences" on the bottom, which is incorrect. Here's a concrete example:

 

application.properties is a file that contains our app's version number in a propety called app.version. I have this file open in the editor and it shows 0.8.139. That is the correct value, but when I diff this file from the Update Project Info tab, it shows 0.8.138 on BOTH sides.

 

I have several other projects which appear to be working correctly and I can't seem to figure out what happened with this one.

Yann Cebron JetBrains 1,752 posts since
Aug 22, 2002
Currently Being Moderated
Mar 21, 2013 5:18 PM in response to: Paul Bienick
Re: git diff no longer works in Update Project Info tab

I reported a similar issue but it has been fixed for long time: http://youtrack.jetbrains.com/issue/IDEA-91293

 

Can you spot a pattern when it does not work?

Kirill Likhodedov Newbie 84 posts since
Jul 15, 2010
Currently Being Moderated
Mar 21, 2013 5:53 PM in response to: Paul Bienick
Re: git diff no longer works in Update Project Info tab

Does it happen on modified files or just on created or deleted files?

Does it happen for all file types or only for certain ones?

Could you please try IDEA 12.1 EAP and see if the issue persists there? I remember some fixes around this area made in 12.1.

Kirill Likhodedov Newbie 84 posts since
Jul 15, 2010
Currently Being Moderated
Mar 27, 2013 7:29 PM in response to: Paul Bienick
Re: git diff no longer works in Update Project Info tab

IntelliJ uses the Local History to show difference.

Could you please open the problematic file in the editor and invoke VCS | Local History | Show History and attach the screenshot?

 

Btw, you're using 12.1, right?

Kirill Likhodedov Newbie 84 posts since
Jul 15, 2010
Currently Being Moderated
Mar 28, 2013 3:33 PM in response to: Paul Bienick
Re: git diff no longer works in Update Project Info tab

If you have such serious problems with error highlighting, please report it to our bugtracker, and we'll do our best to fix it asap.

Kirill Likhodedov Newbie 84 posts since
Jul 15, 2010
Currently Being Moderated
Apr 10, 2013 3:07 PM in response to: Paul Bienick
Re: git diff no longer works in Update Project Info tab

So, Paul, as you mentioned earlier, Diff from Update Project Info works for some files, but doen't work for some other ones, right?

You  mentioned groovy and properties files, that doesn't work. Are there more of them? Are these files have registered file types?

And could you please give an example of files that work fine.

More Like This

  • Retrieving data ...