From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id C1D061F5AE for ; Fri, 3 Jul 2020 04:50:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726300AbgGCEuv (ORCPT ); Fri, 3 Jul 2020 00:50:51 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:52840 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725764AbgGCEuu (ORCPT ); Fri, 3 Jul 2020 00:50:50 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id F0459D50E9; Fri, 3 Jul 2020 00:50:48 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=J7sDnLy5UBbW5m7BZfj0aCTXZxU=; b=Fr0qaz TjwsyyXlAXv4CZ5zsGJs0LnWByFAi85hS3DXpc/vtCimdMsu2kfVMbe8WwzRhxJJ XmC5UhJW8WiQ82BkBDwtAxS2hECUH7J/XbTW8li6GoFDPR1p4YDmm/0fvxuBDv4L wUOEKXcHi/mcnloX/Zxus+ZwdpmuRq4+Ybda4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=Fub7SOtvpjyJIulXY4W4Xy4nWbEVTkX/ AMsLRR3qFz+ReUvsyFRV2NgEOttHTy9HBN9F38E2bjT9G9YcNDo7O3byfd1wWdfz G+b0H7gCt/uNo9xzZ03KJDAxGDEs7qkDBQxq4/biOBeYVc+ns7rJKXWFe7hiwMkv XVpVMu9FLsQ= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id E9787D50E8; Fri, 3 Jul 2020 00:50:48 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.173.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 3DCFCD50E7; Fri, 3 Jul 2020 00:50:46 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "sunlin via GitGitGadget" Cc: git@vger.kernel.org, sunlin , Lin Sun Subject: Re: [PATCH v7] Support auto-merge for meld to follow the vim-diff behavior References: Date: Thu, 02 Jul 2020 21:50:44 -0700 In-Reply-To: (sunlin via GitGitGadget's message of "Fri, 03 Jul 2020 03:26:45 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: C212EE82-BCE8-11EA-8BBE-8D86F504CC47-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "sunlin via GitGitGadget" writes: > ++ When the `--auto-merge` is given, meld will merges all non-conflicting Grammo: "will merges"??? > ++ part automatically, highlight the conflicting part and waiting for user > ++ decision. Setting `mergetool.meld.useAutoMerge` to `true` tells Git to > ++ unconditionally use the `--auto-merge` option with `meld`. Setting this > ++ value to `auto` makes git detect whether `--auto-merge` is supported and > ++ will only use `--auto-merge` when available. A value of `false` avoids > ++ using `--auto-merge` altogether, and is the default value. > + > mergetool.keepBackup:: > After performing a merge, the original file with conflict markers > @@ mergetools/meld: diff_cmd () { > - meld_path="${meld_path:-meld}" > +# Get meld help message > +init_meld_help_msg () { > -+ if test -z "${meld_help_msg:+set}" > ++ if test -z "${meld_help_msg}" Now we do not use the :+ magic, there is no reason to use extra {brace} around the variable name. Just sticking to the normal "$meld_help_msg" would help the readers to hint that there is no strange thing going on. > ++ case "${meld_use_auto_merge_option,,*}" in DON'T. The ${parameter,,pattern} expansion is one of the non-portable bash-isms we do not use in our codebase. Use of it won't fix the correctness problem coming from not using --bool anyway, because ... > ++ true|yes|on|1) ... any numeric value that is not 0 is taken as true. Writing 1 here does not help.