* p4merge no longer working after upgrade to 2.26.0
@ 2020-04-24 4:39 Lars Fricke
2020-04-24 6:48 ` Carlo Marcelo Arenas Belón
0 siblings, 1 reply; 10+ messages in thread
From: Lars Fricke @ 2020-04-24 4:39 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 4:39 p4merge no longer working after upgrade to 2.26.0 Lars Fricke
@ 2020-04-24 6:48 ` Carlo Marcelo Arenas Belón
2020-04-24 6:57 ` Lars Fricke
0 siblings, 1 reply; 10+ messages in thread
From: Carlo Marcelo Arenas Belón @ 2020-04-24 6:48 UTC (permalink / raw)
To: lars.fricke; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 6:48 ` Carlo Marcelo Arenas Belón
@ 2020-04-24 6:57 ` Lars Fricke
2020-04-24 7:09 ` Lars Fricke
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
0 siblings, 2 replies; 10+ messages in thread
From: Lars Fricke @ 2020-04-24 6:57 UTC (permalink / raw)
To: Carlo Marcelo Arenas Belón; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 6:57 ` Lars Fricke
@ 2020-04-24 7:09 ` Lars Fricke
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
1 sibling, 0 replies; 10+ messages in thread
From: Lars Fricke @ 2020-04-24 7:09 UTC (permalink / raw)
To: Carlo Marcelo Arenas Belón; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 6:57 ` Lars Fricke
2020-04-24 7:09 ` Lars Fricke
@ 2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
2020-04-24 7:25 ` Lars Fricke
1 sibling, 1 reply; 10+ messages in thread
From: Carlo Marcelo Arenas Belón @ 2020-04-24 7:20 UTC (permalink / raw)
To: lars.fricke; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
@ 2020-04-24 7:25 ` Lars Fricke
2020-04-24 9:28 ` Lars Fricke
0 siblings, 1 reply; 10+ messages in thread
From: Lars Fricke @ 2020-04-24 7:25 UTC (permalink / raw)
To: Carlo Marcelo Arenas Belón; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 7:25 ` Lars Fricke
@ 2020-04-24 9:28 ` Lars Fricke
2020-04-25 6:52 ` Danh Doan
0 siblings, 1 reply; 10+ messages in thread
From: Lars Fricke @ 2020-04-24 9:28 UTC (permalink / raw)
To: Carlo Marcelo Arenas Belón; +Cc: git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-24 9:28 ` Lars Fricke
@ 2020-04-25 6:52 ` Danh Doan
2020-04-27 11:31 ` Luke Diamand
0 siblings, 1 reply; 10+ messages in thread
From: Danh Doan @ 2020-04-25 6:52 UTC (permalink / raw)
To: lars.fricke; +Cc: Carlo Marcelo Arenas Belón, git
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-25 6:52 ` Danh Doan
@ 2020-04-27 11:31 ` Luke Diamand
2020-04-27 11:45 ` Lars Fricke
0 siblings, 1 reply; 10+ messages in thread
From: Luke Diamand @ 2020-04-27 11:31 UTC (permalink / raw)
To: Danh Doan; +Cc: lars.fricke, Carlo Marcelo Arenas Belón, Git Users
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: p4merge no longer working after upgrade to 2.26.0
2020-04-27 11:31 ` Luke Diamand
@ 2020-04-27 11:45 ` Lars Fricke
0 siblings, 0 replies; 10+ messages in thread
From: Lars Fricke @ 2020-04-27 11:45 UTC (permalink / raw)
To: Luke Diamand; +Cc: Danh Doan, Carlo Marcelo Arenas Belón, Git Users
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
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-04-27 11:46 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-24 4:39 p4merge no longer working after upgrade to 2.26.0 Lars Fricke
2020-04-24 6:48 ` Carlo Marcelo Arenas Belón
2020-04-24 6:57 ` Lars Fricke
2020-04-24 7:09 ` Lars Fricke
2020-04-24 7:20 ` Carlo Marcelo Arenas Belón
2020-04-24 7:25 ` Lars Fricke
2020-04-24 9:28 ` Lars Fricke
2020-04-25 6:52 ` Danh Doan
2020-04-27 11:31 ` Luke Diamand
2020-04-27 11:45 ` Lars Fricke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).