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=-3.9 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 B5A551F5AE for ; Thu, 9 Jul 2020 02:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726211AbgGIC5B (ORCPT ); Wed, 8 Jul 2020 22:57:01 -0400 Received: from pb-smtp21.pobox.com ([173.228.157.53]:55858 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726107AbgGIC5B (ORCPT ); Wed, 8 Jul 2020 22:57:01 -0400 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 3EFE4EAF2D; Wed, 8 Jul 2020 22:56:59 -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=c1VrLvGMR5MzLmj20IAV45MjRq4=; b=akwHvJ CSu/j6jW2T3m/4eBriF3eDAPngEoEM43IrKDfC8nXCjO+Olx+OHqD3Qgvnm2lA/Y PaQgQq+mqs5uhNfbGT3cCvxhdPybnGIbYQRxof0y9cQfKrwlfRWVZ6CztMQUZn4F o7BvYxoZj/zBrHLNKnfzkhG2ybikiflggT+Fg= 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=WR54V6k0uDZJ7Su0Vf6NQanYiMhjpDMQ zpgoPYErdku2ENaSTIhZqSO4wAjuE7T9ny245LjHbiqTSXCymjlslQiysjEuVXHd hotBiV4DK/H6SOol8pDxdzOiklRHRtAtZvk/PCdQNooP3FAiT1lM4IHBe8aEm6Yi u3rCR3Jd8xc= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 38C67EAF2C; Wed, 8 Jul 2020 22:56:59 -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 2E943EAF29; Wed, 8 Jul 2020 22:56:55 -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 v13] Support auto-merge for meld to follow the vim-diff behavior References: Date: Wed, 08 Jul 2020 19:56:53 -0700 In-Reply-To: (sunlin via GitGitGadget's message of "Thu, 09 Jul 2020 00:35:06 +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: D8EC0372-C18F-11EA-95FD-843F439F7C89-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: > + case "$meld_help_msg" in > + *"--output="*|*'[OPTION...]'*) This may be personal preference, but I think the way you spelled this line with SP on both sides of '|' was much easier to read. > + # Check whether we should use 'meld --auto-merge ...' > + if test -z "$meld_use_auto_merge_option" > then > + meld_use_auto_merge_option=$(git config mergetool.meld.useAutoMerge) > + case "$meld_use_auto_merge_option" in > + true|false) > + : use well formatted boolean value > + ;; OK. > + auto) > + # testing the "--auto-merge" option only if config is "auto" > + init_meld_help_msg > + > + case "$meld_help_msg" in > + *"--auto-merge"*|*'[OPTION...]'*) > + meld_use_auto_merge_option=true > + ;; > + *) > + meld_use_auto_merge_option=false > + ;; > + esac > + ;; OK. > + *) This is the case where we saw "", "True", "treu", etc. from the string "git config --get". > + if meld_use_auto_merge_option=$(\ > + git config --bool mergetool.meld.useAutoMerge) You do not need that backslash, do you? Perhaps if meld_use_auto_merge_option=$( git config --bool mergetool.meld.useAutoMerge ) then if you really want to spread them into multiple lines. > + then > + : use normalized boolean value Sure, we got a valid boolean. > + 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? > + fi > + ;; > + esac > fi > } > > base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17