{"thread":{"id":"53306","subject":"p4merge no longer working after upgrade to 2.26.0","startedAt":"2020-04-24T04:39:45Z","lastAt":"2020-04-27T11:46:07Z","messageCount":10,"participants":["Lars Fricke","Carlo Marcelo Arenas Belón","Danh Doan","Luke Diamand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"396105","messageId":"CANYt6aFi+6vKRD71digEh-D0RKkLPBRtek5t8zA-8_cPzwexkQ@mail.gmail.com","threadId":"53306","inReplyTo":null,"subject":"p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-24T04:39:32Z","receivedAt":"2020-04-24T04:39:45Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"Dear git community,\n\nI recently upgraded to git 2.26.0 and this broke my merge/difftool p4merge.\n\nThis is my config with regards to the mergetool\n\nmerge.tool=p4merge\nmergetool.p4merge.path=/opt/perforce/bin/p4merge\nmergetool.p4merge.prompt=false\n\nand this is the error message I am getting. Funnily enough p4merge is\nmentioned in the alternatives\n\ngit config option merge.tool set to unknown tool: p4merge\nResetting to default...This message is displayed because 'merge.tool'\nis not configured.\nSee 'git mergetool --tool-help' or 'git help config' for more details.\n'git mergetool' will now attempt to use one of the following tools:\nopendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse\ndiffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff\n\nColleagues of mine reported that it is still working in 2.25.4\n\nKind regards\n\nLars Fricke\n"},{"id":"396113","messageId":"20200424064805.GB44448@Carlos-MBP","threadId":"53306","inReplyTo":"CANYt6aFi+6vKRD71digEh-D0RKkLPBRtek5t8zA-8_cPzwexkQ@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2020-04-24T06:48:05Z","receivedAt":"2020-04-24T06:48:11Z","isPatch":false,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"does it say it is \"not currently available\" if you run:\n\n $ git mergetool --tool-help\n\ndoes it work if you do :\n\n $ git config --global merge.guitool p4merge\n $ git config --global mergetool.p4merge.trustExitCode true\n\nor change your PATH to include the location of the tool?\n\nCarlo\n\nPS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt\n"},{"id":"396114","messageId":"CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com","threadId":"53306","inReplyTo":"20200424064805.GB44448@Carlos-MBP","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-24T06:57:27Z","receivedAt":"2020-04-24T06:57:39Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"Thanks Carlo for the pointers\n\ngit mergetool --tool-help indeed does NOT list p4merge.\n\nSo support was discontinued?\n\nConfiguring it as merge.guitool also does not work.\n\nRegards,\nLars\n\nOn Fri, Apr 24, 2020 at 8:48 AM Carlo Marcelo Arenas Belón\n wrote:\n>\n> does it say it is \"not currently available\" if you run:\n>\n> $ git mergetool --tool-help\n>\n> does it work if you do :\n>\n> $ git config --global merge.guitool p4merge\n> $ git config --global mergetool.p4merge.trustExitCode true\n>\n> or change your PATH to include the location of the tool?\n>\n> Carlo\n>\n> PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt\n"},{"id":"396115","messageId":"CANYt6aEP4u0vg9tRrtB6A_xY7JcQ5w_RBzDAMnvcW6mnEEr9mQ@mail.gmail.com","threadId":"53306","inReplyTo":"CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-24T07:09:28Z","receivedAt":"2020-04-24T07:09:40Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"Forgot to mention - p4merge is in my PATH\n\nOn Fri, Apr 24, 2020 at 8:57 AM Lars Fricke wrote:\n>\n> Thanks Carlo for the pointers\n>\n> git mergetool --tool-help indeed does NOT list p4merge.\n>\n> So support was discontinued?\n>\n> Configuring it as merge.guitool also does not work.\n>\n> Regards,\n> Lars\n>\n> On Fri, Apr 24, 2020 at 8:48 AM Carlo Marcelo Arenas Belón\n> wrote:\n> >\n> > does it say it is \"not currently available\" if you run:\n> >\n> > $ git mergetool --tool-help\n> >\n> > does it work if you do :\n> >\n> > $ git config --global merge.guitool p4merge\n> > $ git config --global mergetool.p4merge.trustExitCode true\n> >\n> > or change your PATH to include the location of the tool?\n> >\n> > Carlo\n> >\n> > PS. mergetool.prompt is a valid confguration, but not mergetool.$TOOL.prompt\n"},{"id":"396116","messageId":"20200424072049.GC44448@Carlos-MBP","threadId":"53306","inReplyTo":"CANYt6aFjp4wVzYk85Ag9mH3AWp4qUS3+4xsGioyQknKz9tmRUA@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Carlo Marcelo Arenas Belón","fromEmail":"carenas@gmail.com","sentAt":"2020-04-24T07:20:49Z","receivedAt":"2020-04-24T07:20:53Z","isPatch":false,"sender":{"key":"carenas@gmail.com","avatar":"https://avatars.githubusercontent.com/u/76036?v=4"},"body":"On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:\n> \n> git mergetool --tool-help indeed does NOT list p4merge.\n\nbut does show if you run :\n\n $ PATH=$PATH:/opt/perforce/bin\n\n> So support was discontinued?\n\nno; something else might be broken (hopefully only in your setup)\nit seems to work at least on mine :\n\n $ git version\n git version 2.26.2.266.ge870325ee8\n $ git config --list | grep p4\n merge.tool=p4merge\n\nCarlo\n"},{"id":"396117","messageId":"CANYt6aF1o9fmK2rwAA-LPSbd3TeW+x+6LdUj99sg_ANy3Q0kJg@mail.gmail.com","threadId":"53306","inReplyTo":"20200424072049.GC44448@Carlos-MBP","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-24T07:25:02Z","receivedAt":"2020-04-24T07:25:14Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"Setting path explicitly does not help either. Some other colleagues\nare having the same problem.\nSo it might be related to our OS (SLES 12 SP4)\n\nThanks for your help so far. As you said - the issue seems to be on our end.\nI am currently digging through git-mergetool--lib.sh to find out why\nit thinks that p4merge is not a valid tool.\n\nThanks again for your help\nLars\n\nOn Fri, Apr 24, 2020 at 9:20 AM Carlo Marcelo Arenas Belón\n wrote:\n>\n> On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:\n> >\n> > git mergetool --tool-help indeed does NOT list p4merge.\n>\n> but does show if you run :\n>\n> $ PATH=$PATH:/opt/perforce/bin\n>\n> > So support was discontinued?\n>\n> no; something else might be broken (hopefully only in your setup)\n> it seems to work at least on mine :\n>\n> $ git version\n> git version 2.26.2.266.ge870325ee8\n> $ git config --list | grep p4\n> merge.tool=p4merge\n>\n> Carlo\n"},{"id":"396119","messageId":"CANYt6aFN0eAKEhRvNhoiOTu7jO54Kau_ayQMhrdy+7_GPAOCyw@mail.gmail.com","threadId":"53306","inReplyTo":"CANYt6aF1o9fmK2rwAA-LPSbd3TeW+x+6LdUj99sg_ANy3Q0kJg@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-24T09:28:13Z","receivedAt":"2020-04-24T09:28:25Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"Just to help anyone who runs into the same problem.\n\nFor whatever reason (maybe broken package on SLES) the wrapper p4merge\nwas missing from $(git --exec_path)/mergetools.\n\nI just put the version from the official repo there and everything works.\n\nThanks again for your help\n\nKind regards\nLars\n\nOn Fri, Apr 24, 2020 at 9:25 AM Lars Fricke wrote:\n>\n> Setting path explicitly does not help either. Some other colleagues\n> are having the same problem.\n> So it might be related to our OS (SLES 12 SP4)\n>\n> Thanks for your help so far. As you said - the issue seems to be on our end.\n> I am currently digging through git-mergetool--lib.sh to find out why\n> it thinks that p4merge is not a valid tool.\n>\n> Thanks again for your help\n> Lars\n>\n> On Fri, Apr 24, 2020 at 9:20 AM Carlo Marcelo Arenas Belón\n> wrote:\n> >\n> > On Fri, Apr 24, 2020 at 08:57:27AM +0200, Lars Fricke wrote:\n> > >\n> > > git mergetool --tool-help indeed does NOT list p4merge.\n> >\n> > but does show if you run :\n> >\n> > $ PATH=$PATH:/opt/perforce/bin\n> >\n> > > So support was discontinued?\n> >\n> > no; something else might be broken (hopefully only in your setup)\n> > it seems to work at least on mine :\n> >\n> > $ git version\n> > git version 2.26.2.266.ge870325ee8\n> > $ git config --list | grep p4\n> > merge.tool=p4merge\n> >\n> > Carlo\n"},{"id":"396237","messageId":"20200425065250.GB5065@danh.dev","threadId":"53306","inReplyTo":"CANYt6aFN0eAKEhRvNhoiOTu7jO54Kau_ayQMhrdy+7_GPAOCyw@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Danh Doan","fromEmail":"congdanhqx@gmail.com","sentAt":"2020-04-25T06:52:50Z","receivedAt":"2020-04-25T06:52:56Z","isPatch":false,"sender":{"key":"congdanhqx@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42673067?v=4"},"body":"On 2020-04-24 11:28:13+0200, Lars Fricke wrote:\n> Just to help anyone who runs into the same problem.\n> \n> For whatever reason (maybe broken package on SLES) the wrapper p4merge\n> was missing from $(git --exec_path)/mergetools.\n\nIn openSUSE, p4merge is splited into git-p4 subpackage.\nWhich make sense to me.\n\nCan you check that?\n\n\n-- \nDanh\n"},{"id":"396323","messageId":"CAE5ih79Chu7pguToRqmXdKh1BuvP3QGVK+8UDj=5F9_TovE86w@mail.gmail.com","threadId":"53306","inReplyTo":"20200425065250.GB5065@danh.dev","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2020-04-27T11:31:43Z","receivedAt":"2020-04-27T11:31:57Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On Sat, 25 Apr 2020 at 07:53, Danh Doan wrote:\n>\n> On 2020-04-24 11:28:13+0200, Lars Fricke wrote:\n> > Just to help anyone who runs into the same problem.\n> >\n> > For whatever reason (maybe broken package on SLES) the wrapper p4merge\n> > was missing from $(git --exec_path)/mergetools.\n>\n> In openSUSE, p4merge is splited into git-p4 subpackage.\n> Which make sense to me.\n>\n> Can you check that?\n\nThat seems kind of weird. They have nothing to do with each other.\n\n>\n>\n> --\n> Danh\n"},{"id":"396324","messageId":"CANYt6aFZM+Y2UDyx-J=Z1XyKr11k2EM4=wXiXMe+HG4pPWAWug@mail.gmail.com","threadId":"53306","inReplyTo":"CAE5ih79Chu7pguToRqmXdKh1BuvP3QGVK+8UDj=5F9_TovE86w@mail.gmail.com","subject":"Re: p4merge no longer working after upgrade to 2.26.0","fromName":"Lars Fricke","fromEmail":"lars.fricke@gmail.com","sentAt":"2020-04-27T11:45:55Z","receivedAt":"2020-04-27T11:46:07Z","isPatch":false,"sender":{"key":"lars.fricke@gmail.com","avatar":null},"body":"I could not find a corresponding package through yast on SLES.\n\nOn Mon, Apr 27, 2020 at 1:31 PM Luke Diamand wrote:\n>\n> On Sat, 25 Apr 2020 at 07:53, Danh Doan wrote:\n> >\n> > On 2020-04-24 11:28:13+0200, Lars Fricke wrote:\n> > > Just to help anyone who runs into the same problem.\n> > >\n> > > For whatever reason (maybe broken package on SLES) the wrapper p4merge\n> > > was missing from $(git --exec_path)/mergetools.\n> >\n> > In openSUSE, p4merge is splited into git-p4 subpackage.\n> > Which make sense to me.\n> >\n> > Can you check that?\n>\n> That seems kind of weird. They have nothing to do with each other.\n>\n> >\n> >\n> > --\n> > Danh\n"}]}