10 Replies Last post: Mar 12, 2014 5:18 PM by Konstantin Bulenkov  
Kirill Dobryansky Newbie 7 posts since
Feb 12, 2014
Currently Being Moderated

Feb 12, 2014 6:13 PM

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?

Alexey Gopachenko JetBrains 1,462 posts since
Aug 22, 2002
Currently Being Moderated
Mar 3, 2014 6:23 PM in response to: Kirill Dobryansky
Re: Phpstorm 7.1.2 as external git difftool problem

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

Konstantin Bulenkov JetBrains 108 posts since
Sep 26, 2007
Currently Being Moderated
Mar 5, 2014 3:24 PM in response to: Kirill Dobryansky
Re: Phpstorm 7.1.2 as external git difftool problem

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 ?

Konstantin Bulenkov JetBrains 108 posts since
Sep 26, 2007
Currently Being Moderated
Mar 12, 2014 5:18 PM in response to: Kirill Dobryansky
Re: Phpstorm 7.1.2 as external git difftool problem

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

Alexey Gopachenko JetBrains 1,462 posts since
Aug 22, 2002
Currently Being Moderated
Mar 1, 2014 9:10 PM in response to: Kirill Dobryansky
Re: Phpstorm 7.1.2 as external git difftool problem

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

More Like This

  • Retrieving data ...