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-ASN: AS53758 23.128.96.0/24 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,RCVD_IN_DNSWL_HI,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 2F07D1F5AE for ; Sun, 2 May 2021 02:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231670AbhEBCkj (ORCPT ); Sat, 1 May 2021 22:40:39 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:59884 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230409AbhEBCkj (ORCPT ); Sat, 1 May 2021 22:40:39 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 2EFAEBAE69; Sat, 1 May 2021 22:39:48 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=6e+OVxPjg98d1E42wws2QSkEqJzABGCUWRFnoW kj8H0=; b=IOsyAUCNFsKDoVI9K1yrXqUOAvFfDk9/a3RpTCV/fvKLpRw6A9W5zC 4iPPrP6eCZN3c73Q4+20lLlOEK42yqS7Yt0YP7TJ+vztv71Vyz+pzWiAbrwJwvP9 ICLiJCpOFqAaQcAV95U9njCcPOgZi8YXdeipCFZ4Qz5EWoIgnxTwQ= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 26C45BAE68; Sat, 1 May 2021 22:39:48 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.74.119.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id A6F0ABAE67; Sat, 1 May 2021 22:39:47 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Eric Sunshine Cc: Josh Soref , Josh Soref via GitGitGadget , Git List Subject: Re: [PATCH v3] git-merge: rewrite already up to date message References: Date: Sun, 02 May 2021 11:39:47 +0900 In-Reply-To: (Eric Sunshine's message of "Sat, 1 May 2021 22:15:18 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: A92AE942-AAEF-11EB-8B4F-D152C8D8090B-77302942!pb-smtp1.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Eric Sunshine writes: > Indeed. While it might be nice to settle upon a single punctuation > style for these messages, I don't see this as a requirement of the > patch in question. It could, of course, be re-rolled as a two-patch > series in which the second patch addresses the exclamation points, but > fixing the punctuation could also be done later as a follow-up patch > by someone (it doesn't need to be you). So, I don't see a good reason > to hold up the current patch which stands nicely on its own. I would agree in general, especially for a patch that fixes some behaviour that hurts people *and* does a clean-up while at it, that it is OK that the secondary "clean-up" part does not do as through job as it should. But isn't the premise of this particular patch "these 'already up-to-date' messages puzzle readers by being sligntly different, when the differences are not meant to convey anything, so let's unify them and make them more coherent to help readers and translators", is it? I think that was why "Yeeah!" was removed, for example. Now we were made aware of the presence of "Already up to date" vs "Already up to date!" by the "grep" tool. Leaving half the grep hits unaddressed makes the patch look like stopping halfway the task it started to do. So, in this particular case, I do not agree with any of the "two-patch" or "follow-up" or "somebody else can do so". Thanks.