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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



<lin.sun@xxxxxxx> writes:

> 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?

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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux