From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 09A136DE0355 for ; Sun, 7 May 2017 18:44:32 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.005 X-Spam-Level: X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5 tests=[AWL=0.006, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MSqSeJfAwyq0 for ; Sun, 7 May 2017 18:44:30 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id B34126DE0352 for ; Sun, 7 May 2017 18:44:30 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1d7Xi5-0004Yb-Ew; Sun, 07 May 2017 21:43:37 -0400 Received: (nullmailer pid 20814 invoked by uid 1000); Mon, 08 May 2017 01:44:27 -0000 From: David Bremner To: David Bremner , notmuch@freelists.org, notmuch@notmuchmail.org Subject: [PATCH 2/2] cli/dump: don't include tags when not asked for Date: Sun, 7 May 2017 22:44:23 -0300 Message-Id: <20170508014423.20765-2-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170508014423.20765-1-david@tethera.net> References: <87y3u8vjbo.fsf@tethera.net> <20170508014423.20765-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 May 2017 01:44:32 -0000 Add in the analogous test for tags that is given for properties a few lines below. --- notmuch-dump.c | 3 ++- test/T610-message-property.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index e451ac0c..5cc3b2f6 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -250,7 +250,8 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output, message = notmuch_messages_get (messages); - if (dump_tags_message (notmuch, message, output_format, output, + if ((include & DUMP_INCLUDE_TAGS) && + dump_tags_message (notmuch, message, output_format, output, &buffer, &buffer_size)) return EXIT_FAILURE; diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh index 7d95bde6..ba5f55da 100755 --- a/test/T610-message-property.sh +++ b/test/T610-message-property.sh @@ -210,7 +210,6 @@ notmuch dump | grep '^#=' > OUTPUT test_expect_equal_file PROPERTIES OUTPUT test_begin_subtest "dump _only_ message properties" -test_subtest_known_broken cat < EXPECTED #notmuch-dump batch-tag:3 properties #= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue1 testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3 -- 2.11.0