From: David Bremner <david@tethera.net>
Date: Thu, 1 Jun 2017 10:54:38 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~58
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1;hp=6ac3d8c27f8edc8b3b84440900771053d6efd9dd

Merge branch 'release'
---

diff --git a/NEWS b/NEWS
index a63e340e..70bce788 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Notmuch 0.24.2 (2017-06-01)
+===========================
+
+Command Line Interface
+----------------------
+
+Fix output from `notmuch dump --include=properties` to not include tags.
+
+Emacs
+-----
+
+Fix filename stashing in tree view.
+
 Notmuch 0.24.1 (2017-04-01)
 ===========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index bfdcf7ed..6101902b 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.24.1'
+__VERSION__ = '0.24.2'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index 478f450f..c955fbfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.24.2-1) experimental; urgency=medium
+
+  * Fix dump output to not include tags when not asked for
+  * Fix file name stashing in emacs tree view.
+
+ -- David Bremner <bremner@debian.org>  Thu, 01 Jun 2017 07:24:55 -0300
+
 notmuch (0.24.1-1) experimental; urgency=medium
 
   * Restore Xapian wildcard queries to from: and subject:
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 65ff19dc..ba5f55da 100755
--- a/test/T610-message-property.sh
+++ b/test/T610-message-property.sh
@@ -209,6 +209,14 @@ EOF
 notmuch dump | grep '^#=' > OUTPUT
 test_expect_equal_file PROPERTIES OUTPUT
 
+test_begin_subtest "dump _only_ message properties"
+cat <<EOF > 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
+EOF
+notmuch dump --include=properties > OUTPUT
+test_expect_equal_file EXPECTED OUTPUT
+
 
 test_begin_subtest "restore missing message property (single line)"
 notmuch dump | grep '^#=' > BEFORE1
diff --git a/version b/version
index 48b91fd8..8b95abd9 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24.1
+0.24.2