From: David Bremner Date: Mon, 8 May 2017 01:44:23 +0000 (-0300) Subject: cli/dump: don't include tags when not asked for X-Git-Tag: 0.24.2~4 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=11fda0bf2fd74b227d15a2bb6b36a8ce6403c8e9 cli/dump: don't include tags when not asked for Add in the analogous test for tags that is given for properties a few lines below. --- diff --git a/notmuch-dump.c b/notmuch-dump.c index 0bb946f8..f0ac1932 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