From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 9F1341F44D for ; Sat, 9 Mar 2024 19:56:09 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.a=rsa-sha256 header.s=sasl header.b=v0Bjchgi; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DDF7F1F21C1D for ; Sat, 9 Mar 2024 19:56:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 441674EB34; Sat, 9 Mar 2024 19:55:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="v0Bjchgi" Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86C5916FF30 for ; Sat, 9 Mar 2024 19:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=173.228.157.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710014157; cv=none; b=VDOH7Mq2/vqoeAu4wxx4PxR5CBozS7IqcD4azKZ7fHluQt2kWTBJrrNla8lZMKBAL14J4/L4g4IWAEJPfLv+GbFpCisjBog0o6Ar1qmH4uwDTolYjmWXcqhou/dn18VBdO4KLrqSSjyyq5F169i7E49e8AeguD6XtzOr1t3Mht0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710014157; c=relaxed/simple; bh=znpEhZWwF2Kq9fyGZ/MQlFVmSiZsLFUNSEuv2j0KaEs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=ZZjKzKkVmqJK/nWkHFsJ20ZLpbTV8lBhMTmnaOSXTw58DnL+Q0hkyc/sJ7Y1E4hV4NeFpkA2uWUAkERfzrm3J4s8GiQXShrdrsMFCTK6FNKJo+HvqnpSVUnRlewigpXYMgfHZZfVLZ8KSxBaQz1kRcf7S4tou9LNSrt3joAJWmA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com; spf=pass smtp.mailfrom=pobox.com; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b=v0Bjchgi; arc=none smtp.client-ip=173.228.157.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=pobox.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pobox.com Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id BF6061B280; Sat, 9 Mar 2024 14:55:55 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=znpEhZWwF2Kq9fyGZ/MQlFVmSiZsLFUNSEuv2j 0KaEs=; b=v0BjchgiVQvkn+5nQ9Iv6GhE/4mVlZjskO03UpD1A+lwD5xOtOFcYX e7IifvNDTGAv9HNwPeqaFW/3mR4szR36yoc21+u7QmAqIQwCOaRwP3gVv6TVjdEH bAzBZ/KUifJoP0iUiD9JpXi8mFQn6EF5odH6H6ecTztJSS+ioowfk= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id AB8FE1B27F; Sat, 9 Mar 2024 14:55:55 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.125.185.65]) (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 4BC4D1B27E; Sat, 9 Mar 2024 14:55:52 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Philippe Blain Cc: Philippe Blain via GitGitGadget , git@vger.kernel.org, Phillip Wood Subject: Re: [PATCH] sequencer: allow disabling conflict advice In-Reply-To: <570a8736-5552-6279-4aea-8acdf8af50df@gmail.com> (Philippe Blain's message of "Sat, 9 Mar 2024 13:58:45 -0500") References: <6ef490d2-ce0a-f8bd-8079-6b4ef3e37eda@gmail.com> <570a8736-5552-6279-4aea-8acdf8af50df@gmail.com> Date: Sat, 09 Mar 2024 11:55:50 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 089BC514-DE4F-11EE-8C51-A19503B9AAD1-77302942!pb-smtp21.pobox.com Philippe Blain writes: > Thinking about this more and looking at the code, using 'advice_enabled' in the condition > instead of using 'advise_if_enabled' for each message has a side effect: > the text "hint: Disable this message with "git config advice.sequencerConflict false" > will not appear, which I find less user friendly... Good eyes. I agree that you have to do that part yourself at the end of that "if () { ... }" block using turn_off_instructions[] string.