# p4merge no longer working after upgrade to 2.26.0 10 messages from 2020-04-24 to 2020-04-27. Participants: Lars Fricke, Carlo Marcelo Arenas Belón, Danh Doan, Luke Diamand. Thread: https://gitlist.dev/t/53306 ## Lars Fricke, 2020-04-24 04:39 Subject: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aFi%2B6vKRD71digEh-D0RKkLPBRtek5t8zA-8_cPzwexkQ%40mail.gmail.com ``` 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 ``` ## Carlo Marcelo Arenas Belón, 2020-04-24 06:48 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: <20200424064805.GB44448@Carlos-MBP> URL: https://gitlist.dev/e/20200424064805.GB44448%40Carlos-MBP In-Reply-To: ``` 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 ``` ## Lars Fricke, 2020-04-24 06:57 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3%2B4xsGioyQknKz9tmRUA%40mail.gmail.com In-Reply-To: <20200424064805.GB44448@Carlos-MBP> ``` 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 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 ``` ## Lars Fricke, 2020-04-24 07:09 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aEP4u0vg9tRrtB6A_xY7JcQ5w_RBzDAMnvcW6mnEEr9mQ%40mail.gmail.com In-Reply-To: ``` Forgot to mention - p4merge is in my PATH On Fri, Apr 24, 2020 at 8:57 AM Lars Fricke 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 > 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 ``` ## Carlo Marcelo Arenas Belón, 2020-04-24 07:20 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: <20200424072049.GC44448@Carlos-MBP> URL: https://gitlist.dev/e/20200424072049.GC44448%40Carlos-MBP In-Reply-To: ``` 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 ``` ## Lars Fricke, 2020-04-24 07:25 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aF1o9fmK2rwAA-LPSbd3TeW%2Bx%2B6LdUj99sg_ANy3Q0kJg%40mail.gmail.com In-Reply-To: <20200424072049.GC44448@Carlos-MBP> ``` 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 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 ``` ## Lars Fricke, 2020-04-24 09:28 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aFN0eAKEhRvNhoiOTu7jO54Kau_ayQMhrdy%2B7_GPAOCyw%40mail.gmail.com In-Reply-To: ``` 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 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 > 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 ``` ## Danh Doan, 2020-04-25 06:52 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: <20200425065250.GB5065@danh.dev> URL: https://gitlist.dev/e/20200425065250.GB5065%40danh.dev In-Reply-To: ``` On 2020-04-24 11:28:13+0200, Lars Fricke 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 ``` ## Luke Diamand, 2020-04-27 11:31 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CAE5ih79Chu7pguToRqmXdKh1BuvP3QGVK%2B8UDj%3D5F9_TovE86w%40mail.gmail.com In-Reply-To: <20200425065250.GB5065@danh.dev> ``` On Sat, 25 Apr 2020 at 07:53, Danh Doan wrote: > > On 2020-04-24 11:28:13+0200, Lars Fricke 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 ``` ## Lars Fricke, 2020-04-27 11:45 Subject: Re: p4merge no longer working after upgrade to 2.26.0 Message-ID: URL: https://gitlist.dev/e/CANYt6aFZM%2BY2UDyx-J%3DZ1XyKr11k2EM4%3DwXiXMe%2BHG4pPWAWug%40mail.gmail.com In-Reply-To: ``` I could not find a corresponding package through yast on SLES. On Mon, Apr 27, 2020 at 1:31 PM Luke Diamand wrote: > > On Sat, 25 Apr 2020 at 07:53, Danh Doan wrote: > > > > On 2020-04-24 11:28:13+0200, Lars Fricke 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 ```