Re: [PATCH v13] Support auto-merge for meld to follow the vim-diff behavior

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 9, 2020, 04:49 UTC
Message-ID: <xmqqd055z40h.fsf@gitster.c.googlers.com>
In-Reply-To: <261a01d655a0$71077210$53165630$@zoom.us>

<lin.sun@zoom.us> writes:

Show 14 quoted lines

> Hi Junio,
>
> I'll add SP on both side of  '|', and remove the backslash, thank you.
>
> This line assign value with `git config --bool...` is over 80 characters, so there is a break. 
>
>>> +			else
>>> +				meld_use_auto_merge_option=false
>>Why? Shoudln't we loudly complain to let the user know of a misspelt value in the configuration?
>
> The command line `git config --bool ...` without "2>&/dev/null" will print error message, just passthrough to user.
> $ git config mergetool.meld.useAutoMerge hello 
> $ git mergetool --tool=meld 
> fatal: bad numeric config value 'hello' for 'mergetool.meld.useautomerge' in .git/config: invalid unit

Yes, but you do not exit(1) here, so the user will keep going without having a chance to stop, think and correct the misspelt value in the configuration file, no?

Show 5 quoted lines

>
> I'll upload the changes soon.
>
> Regards
> Lin