Phpstorm 7.1.2 as external git difftool problem

Hi
I'm using phpstorm 7.1.2 as external difftool in git. And on the latest release of phpstorm somethin went wrong.

Details.

My git config:

[difftool "phpstorm"]
    prompt = true
    cmd = cmd.exe //C "\"C:/Program Files (x86)/JetBrains/PhpStorm 7.1.1/bin/PhpStorm.bat\" diff \"$LOCAL\" \"C:/project/$REMOTE\""
    trustExitCode = true

After executing "git difftool master...branchname" git prints to open viewer for first diff:

Viewing: 'folder/class.php
Launch 'phpstorm' [Y/n]:


I'm pressing Y and phpstorm launches with error:
"Diff: Error showing diff: Can't find file nul"

But on the second promt for viewing (within one difftool session):

Viewing: 'index.php'
Launch 'phpstorm' [Y/n]:


phpstorm launches without errors in difftool mode.

What can it be?

10 comments

Note from the developer: please run .exe launcher instead of .bat

0

Very strange, but now it's broken again.
First diff is ok, but other returns "Error showing diff: Can't find file nul" in diff window.

0

Have you switched to phpstorm.exe launcher instead of phpstorm.bat ?

0

Yes, I changed bar to exe. At least 2 more people from our team members has the same problem when using windows git bash + phpstorm as difftool

0

Hi Kirill, could you please run it once as you've described, then try to run again (here we have the problem described)
Go to Task Manager (Ctrl+Shift+Esc) and try to find phpstorm or java processes here. Also, could you please share your idea.exe.vmoptions ?

0

Another error I recieved: "Error showing diff: Can't find file C:/Users/KDOBRY~1/AppData/Local/Temp/mJNtWb_Common.php"

0

Repeated the problem. PHP storm running, "Java(TM) Update Scheduler" is running.

Where can I find "idea.exe.vmoptions"?

P.S. Today I had another error ("Error showing diff: Can't find file C:/Users/KDOBRY~1/AppData/Local/Temp/mJNtWb_Common.php") from the first diff run and the old error when other diff  was launched.

P.P.S. Can we speak russian, it will be easer to communicate ))

0

I have found a system for this behaviour. Error appear only if opened file was created in new branch and didn't exist in master.

0

Sure,  find me in Skype (konstantin.bulenkov) and we will be able to continue in Russian

0

Please sign in to leave a comment.