p4merge no longer working after upgrade to 2.26.0

p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

Dear git community,

I recently upgraded to git 2.26.0 and this broke my merge/difftool p4merge.

This is my config with regards to the mergetool

merge.tool=p4merge
mergetool.p4merge.path=/opt/perforce/bin/p4merge
mergetool.p4merge.prompt=false

and this is the error message I am getting. Funnily enough p4merge is
mentioned in the alternatives

git config option merge.tool set to unknown tool: p4merge
Resetting to default...This message is displayed because 'merge.tool'
is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse
diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff

Colleagues of mine reported that it is still working in 2.25.4

Kind regards

Lars Fricke

Re: p4merge no longer working after upgrade to 2.26.0

[Carlo Marcelo Arenas Belón]

does it say it is "not currently available" if you run:

  $ git mergetool --tool-help

does it work if you do :

  $ git config --global merge.guitool p4merge
  $ git config --global mergetool.p4merge.trustExitCode true

or change your PATH to include the location of the tool?

Carlo

PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt

Re: p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

Thanks Carlo for the pointers

git mergetool --tool-help indeed does NOT list p4merge.

So support was discontinued?

Configuring it as merge.guitool also does not work.

Regards,
Lars

On Fri, Apr 24, 2020 at 8:48 AM Carlo Marcelo Arenas Belón
<carenas@gmail.com> wrote:
>
> does it say it is "not currently available" if you run:
>
>   $ git mergetool --tool-help
>
> does it work if you do :
>
>   $ git config --global merge.guitool p4merge
>   $ git config --global mergetool.p4merge.trustExitCode true
>
> or change your PATH to include the location of the tool?
>
> Carlo
>
> PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt

Re: p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

Forgot to mention - p4merge is in my PATH

On Fri, Apr 24, 2020 at 8:57 AM Lars Fricke <lars.fricke@gmail.com> wrote:
>
> Thanks Carlo for the pointers
>
> git mergetool --tool-help indeed does NOT list p4merge.
>
> So support was discontinued?
>
> Configuring it as merge.guitool also does not work.
>
> Regards,
> Lars
>
> On Fri, Apr 24, 2020 at 8:48 AM Carlo Marcelo Arenas Belón
> <carenas@gmail.com> wrote:
> >
> > does it say it is "not currently available" if you run:
> >
> >   $ git mergetool --tool-help
> >
> > does it work if you do :
> >
> >   $ git config --global merge.guitool p4merge
> >   $ git config --global mergetool.p4merge.trustExitCode true
> >
> > or change your PATH to include the location of the tool?
> >
> > Carlo
> >
> > PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt

Re: p4merge no longer working after upgrade to 2.26.0

[Carlo Marcelo Arenas Belón]

On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:
> 
> git mergetool --tool-help indeed does NOT list p4merge.

but does show if you run :

  $ PATH=$PATH:/opt/perforce/bin

> So support was discontinued?

no; something else might be broken (hopefully only in your setup)
it seems to work at least on mine :

  $ git version
  git version 2.26.2.266.ge870325ee8
  $ git config --list | grep p4
  merge.tool=p4merge

Carlo

Re: p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

Setting path explicitly does not help either. Some other colleagues
are having the same problem.
So it might be related to our OS (SLES 12 SP4)

Thanks for your help so far. As you said - the issue seems to be on our end.
I am currently digging through git-mergetool--lib.sh to find out why
it thinks that p4merge is not a valid tool.

Thanks again for your help
Lars

On Fri, Apr 24, 2020 at 9:20 AM Carlo Marcelo Arenas Belón
<carenas@gmail.com> wrote:
>
> On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:
> >
> > git mergetool --tool-help indeed does NOT list p4merge.
>
> but does show if you run :
>
>   $ PATH=$PATH:/opt/perforce/bin
>
> > So support was discontinued?
>
> no; something else might be broken (hopefully only in your setup)
> it seems to work at least on mine :
>
>   $ git version
>   git version 2.26.2.266.ge870325ee8
>   $ git config --list | grep p4
>   merge.tool=p4merge
>
> Carlo

Re: p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

Just to help anyone who runs into the same problem.

For whatever reason (maybe broken package on SLES) the wrapper p4merge
was missing from $(git --exec_path)/mergetools.

I just put the version from the official repo there and everything works.

Thanks again for your help

Kind regards
Lars

On Fri, Apr 24, 2020 at 9:25 AM Lars Fricke <lars.fricke@gmail.com> wrote:
>
> Setting path explicitly does not help either. Some other colleagues
> are having the same problem.
> So it might be related to our OS (SLES 12 SP4)
>
> Thanks for your help so far. As you said - the issue seems to be on our end.
> I am currently digging through git-mergetool--lib.sh to find out why
> it thinks that p4merge is not a valid tool.
>
> Thanks again for your help
> Lars
>
> On Fri, Apr 24, 2020 at 9:20 AM Carlo Marcelo Arenas Belón
> <carenas@gmail.com> wrote:
> >
> > On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:
> > >
> > > git mergetool --tool-help indeed does NOT list p4merge.
> >
> > but does show if you run :
> >
> >   $ PATH=$PATH:/opt/perforce/bin
> >
> > > So support was discontinued?
> >
> > no; something else might be broken (hopefully only in your setup)
> > it seems to work at least on mine :
> >
> >   $ git version
> >   git version 2.26.2.266.ge870325ee8
> >   $ git config --list | grep p4
> >   merge.tool=p4merge
> >
> > Carlo

Re: p4merge no longer working after upgrade to 2.26.0

[Danh Doan]

On 2020-04-24 11:28:13+0200, Lars Fricke <lars.fricke@gmail.com> wrote:
> Just to help anyone who runs into the same problem.
> 
> For whatever reason (maybe broken package on SLES) the wrapper p4merge
> was missing from $(git --exec_path)/mergetools.

In openSUSE, p4merge is splited into git-p4 subpackage.
Which make sense to me.

Can you check that?


-- 
Danh

Re: p4merge no longer working after upgrade to 2.26.0

[Luke Diamand]

On Sat, 25 Apr 2020 at 07:53, Danh Doan <congdanhqx@gmail.com> wrote:
>
> On 2020-04-24 11:28:13+0200, Lars Fricke <lars.fricke@gmail.com> wrote:
> > Just to help anyone who runs into the same problem.
> >
> > For whatever reason (maybe broken package on SLES) the wrapper p4merge
> > was missing from $(git --exec_path)/mergetools.
>
> In openSUSE, p4merge is splited into git-p4 subpackage.
> Which make sense to me.
>
> Can you check that?

That seems kind of weird. They have nothing to do with each other.

>
>
> --
> Danh

Re: p4merge no longer working after upgrade to 2.26.0

[Lars Fricke]

I could not find a corresponding package through yast on SLES.

On Mon, Apr 27, 2020 at 1:31 PM Luke Diamand <luke@diamand.org> wrote:
>
> On Sat, 25 Apr 2020 at 07:53, Danh Doan <congdanhqx@gmail.com> wrote:
> >
> > On 2020-04-24 11:28:13+0200, Lars Fricke <lars.fricke@gmail.com> wrote:
> > > Just to help anyone who runs into the same problem.
> > >
> > > For whatever reason (maybe broken package on SLES) the wrapper p4merge
> > > was missing from $(git --exec_path)/mergetools.
> >
> > In openSUSE, p4merge is splited into git-p4 subpackage.
> > Which make sense to me.
> >
> > Can you check that?
>
> That seems kind of weird. They have nothing to do with each other.
>
> >
> >
> > --
> > Danh