From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mMUIIe946GFVeQAAgWs5BA (envelope-from ) for ; Wed, 19 Jan 2022 21:47:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id sJG9Ge946GGr+QAAG6o9tA (envelope-from ) for ; Wed, 19 Jan 2022 21:47:43 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 32CC71AE17 for ; Wed, 19 Jan 2022 21:47:43 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 347B25F6DA; Wed, 19 Jan 2022 20:47:38 +0000 (UTC) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 836335F6BE for ; Wed, 19 Jan 2022 20:47:35 +0000 (UTC) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id 5F2CA1B00120; Wed, 19 Jan 2022 22:47:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1642625253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=asoByHVPu++w//kka1o07pFRl/Rlq3IUFhMXuVQkMAQ=; b=O99unIpgVOagvkzU/do9gjnh2RyAcHZrOUSnHJejqAmmu74Y+OTTqhbo53FI/IbhBK5Sw8 m5n/Jd+5i70jP6LRb2d50YLMJti7K12iOgPbY9SkSfL1GiNl2SumCui9sAdfF73z0YG6YU 4lSZM5dojJcrdHzRSB/xjlZ9iJNZL3b/dDabNvE6i/KHZd60GokTEowGSEFgRcMIIDVzPd w4fNWkRaxLoqtxOhRrWaMOjadbn5v5GS6slixO8Osync7umSskAcwi+pM6DTbkimXn3w6J uv8dqE5J0YWj6v7l/LjmRmOTKiFZsgcs/6Q5PIgMHwbUvuligKzbZxDO+jEi+w== From: Tomi Ollila To: David Bremner , David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] CLI: print extra headers only for non-replies In-Reply-To: <20220119013400.3155683-1-david@tethera.net> References: <20220119011451.3079127-1-david@tethera.net> <20220119013400.3155683-1-david@tethera.net> User-Agent: Notmuch/0.33+54~gcaf4513 (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1642625253; a=rsa-sha256; cv=none; b=gE8WJ3xP7BxCgK5yHYfw5563ohVBCUOWdJ2iNbsFxIm5o341BKHJ0R5aQLf/f/fPCBEsLz eRtcX4yzKINIFAUizl++spzBrkSGhswqP3dvG+GAWC1qCltDRzu2+KHJCJx2H3Sv7pqUrm s6PcSvbtitmf2RRjTdUirv61S2WzjvcutsErvgRWDDX2hS1vvhhTEf4hpfzrYZpRRmZbcy 0gy/1KJlRxfslbbVEy9If/qeHps4CIvrffE8fKyZ3e9b3nF+1IMvMfkqUgoVhxLuJio5nO V/qC7Ssv96ai5AvT2l1UAKT3x/tb7wkI7GFw2WQlXFNyJCEOnTThCreivfCfvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1642625253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=asoByHVPu++w//kka1o07pFRl/Rlq3IUFhMXuVQkMAQ=; b=Dqc6cVqGqFw46g2C6BvDW4D5syBkwFpOvC+i8v1nbKGHuZiqEmaJgF1VMvtcpm92VH/ANe M8hlx2RwDP/geQeiUXaJZoMF7m5clYarixHoWoLEDWng2wNacsWtBtJN3MYCIN/5gW8IrL g/OOx33VM7ZzVHyGZp+BeGTJSrw08Y/gCr05eNY3gKu0/u9X2g9QMMgIsWH+JZGoE5c5wO 2aUgV+keac3jGcg9cStSS5kl6JcpWmwdRBO4jrpud1D0aJmUa7YEWS72aPPk9r4B9Ii6+y beG/3ja1ct1oNPKr+MROluTJ0jxKdve7f9Tm6rmjAJlfiPbMwIrD3nFNwz9Tlg== Message-ID-Hash: QHDK267Q22E3GHRJGUUA5WTWKYKZR26T X-Message-ID-Hash: QHDK267Q22E3GHRJGUUA5WTWKYKZR26T X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642625263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=BRFnIeiqKaqoe99XOIsexv6Nw4jmsI54nl4EqSA1nZE=; b=vAJFICCaYAXHJmOnlYXKZIDgOh/DlGLz6SiJDiQ6Q7TF3yl1BLuNcjz2SqpMW5WD/QpTvz 3/saQOPe6JIwV45dnnlWooHYVJfkL6kR7QGx4Fl1hNnwzl18M06tF+Naaj7QvaZgIYhcHc kje8/65ayFAjBfFko7hWv2vUxFUciAAoQqrYz8Fp9SVmcEqAn9ZLF4C0EhADzLOFm4UV3G QQUMWGTonxN/Qcy0Hox9M3Q/5W5pYkRU0si2j8cUvxgX4Q32G6ugcal6TJ8pcOrod7FYvs AGWwDZS9GKxnSRPTvfhBfomBDAG20K9dqehfhcd8RrnuFGDuMy+qbs6PMUnCrA== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1642625263; a=rsa-sha256; cv=fail; b=PTD6Ynz1ZRDLkxPv1dI57/CEZMR7qevXYqSKnhEoaBM6VX01KU5s8enT4Ab/6Ba4dchPS8 SsbmXF7PM7i+bDInM9wRc6qae5Lnr12u59uk7Ga8vg5hDBFDpZ8efGA6//xRamvAvkF6p+ mELT8P7ajt/nlhdYv+yaJn4Go7nefPYmzctt/e0okCn5G+GF/E7Dvjsd7wtrYgrGUq6lxY c6nMAwgJ9+o+D4+FWHFrMQbrg6egJm4GRWDsQx7cT7Wr+ed8XDBFY7eqMWYSgT3X1GNhna 7NrzMqq8Ws4P009GvtOkjNbQwXdvIsgblaqSWvwNqH1jKFm0Ao4f3mjoURRryA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=O99unIpg; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.95 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=O99unIpg; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 32CC71AE17 X-Spam-Score: -0.95 X-Migadu-Scanner: scn0.migadu.com X-TUID: LW8xlFwrWIV/ On Tue, Jan 18 2022, David Bremner wrote: > If in the future we decide to output extra headers for replies, this > should be controlled by a separate configuration option. > --- > notmuch-show.c | 3 ++- > test/T310-emacs.sh | 1 - > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/notmuch-show.c b/notmuch-show.c > index 136f4439..6a54d9c1 100644 > --- a/notmuch-show.c > +++ b/notmuch-show.c > @@ -294,7 +294,8 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message, > } > > /* Output extra headers the user has configured, if any */ > - format_extra_headers_sprinter (sp, message); > + if (! reply) > + format_extra_headers_sprinter (sp, message); Looks simple enough for LGTM. Tomi > sp->end (sp); > talloc_free (local); > } > diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh > index 831df1cc..a05b828a 100755 > --- a/test/T310-emacs.sh > +++ b/test/T310-emacs.sh > @@ -486,7 +486,6 @@ EOF > test_expect_equal_file EXPECTED OUTPUT > > test_begin_subtest "Reply with show.extra_headers set" > -test_subtest_known_broken > notmuch config set show.extra_headers Received > add_message '[from]="Sender "' \ > [to]=test_suite_other@notmuchmail.org > -- > 2.34.1 > > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org