Re: Issue with meld + git on Ubuntu 15.04

[Kai Willadsen <kai willadsen gmail com>]

On 16 June 2015 at 18:43, Kai Willadsen <kai willadsen gmail com> wrote:

On 7 June 2015 at 18:13, Louis Popi <theh2o64 gmail com> wrote:

-------- Message transféré --------

Sujet :	Issue with meld + git on Ubuntu 15.04
Date :	Sun, 07 Jun 2015 09:22:06 +0200
De :	Louis Popi <theh2o64 gmail com>
Pour :	///meld-list gnome org

Hi !
I face a very wierd error on Ubuntu 15.04 (with the regular deb and the build from source version)

/usr/bin/meld:290: Warning: g_object_unref: assertion 'G_IS_OBJECT (object)' failed
status = meld.meldapp.app.run(sys.argv)

Every is fine on the terminal except from this warning.
My error : I'm manipulating git. When I have a conflict I use 'git mergetool', it opens meld but no ">>>>" appears and the "REMOTE" file is in the middle (I mean that the middle one and the right one are the same files). To fix it, I have to reload the file (by going into "Browse", etc, ...).

Can you try to get this error ? 

Here is the script to call meld by git mergetool : https://github.com/git/git/blob/master/mergetools/meld
Here is the git mergetool documentation : https://github.com/git/git/blob/master/Documentation/git-mergetool.txt

There's no reason that I know of for that mergetool script to break (other than that it's wrong about --output, but whatever). If you can paste the actual command line being run, then that would help tell whether the problem is Meld or something else. Otherwise, please file a bug and I'll try and get around to running up an ubuntu VM sometime.

I've just checked this on a fresh 15.04 install with git and Meld from the repos, and it works as expected.

You may want to check your mergetool config and see that you don't have user- or repo-specific config doing different things.

cheers,

Kai