Re: [PATCH v2] git gui: add directly calling merge tool from gitconfig

From: Johannes Sixt <j6t@kdbg.org>
Date: Sep 6, 2024, 17:43 UTC
Message-ID: <a8ed352a-bcb8-4e62-945a-ac5d6ff78841@kdbg.org>
In-Reply-To: <AS2PR08MB828842126285586C19028FB5E19E2@AS2PR08MB8288.eurprd08.prod.outlook.com>

Am 06.09.24 um 08:32 schrieb tobias.boesch@miele.com:

Show 8 quoted lines

>> Von: Johannes Sixt <j6t@kdbg.org>
>> While testing I configured meld incorrectly once and got no feedback
>> whatsoever, but I would not attribute this to this patch.
>>
> 
> That's odd. I tested this again by setting merge.tool to "meld" and
> configured mergetool.cmd to "some wrong path". When starting the
> mergetool I got a popup saying that meld was not found in path.

But if the configuration is

   cmd = "meld far too many arguments provided"

and 'meld' *is* in the path, then there is no feedback because meld can be started successfully, but reports an error only on stdout or stderr, which is ignored by Git GUI. And the exit code seems to be ignored, too.

But this can be treated in a follow-up patch if necessary.

-- Hannes