From: David Bremner <david@tethera.net>
Date: Fri, 27 Apr 2018 01:47:40 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.27_rc0~42
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=388edce0b70ddababfe52b7764202a854784545d;hp=963ccabe93b0564e6979433f5be34395e9aa8ef1

Merge branch 'release'

minimal mset fix, for 0.26.2
---

diff --git a/NEWS b/NEWS
index 736d9602..2107209d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,12 @@ Notmuch 0.26.2 (UNRELEASED)
 Library Changes
 ---------------
 
+Work around Xapian bug with `get_mset(0,0, x)`.
+
+  This causes aborts in `_notmuch_query_count_documents` on
+  e.g. Fedora 28.  The underlying bug is fixed in Xapian commit
+  f92e2a936c1592, and will be fixed in Xapian 1.4.6.
+
 Make thread indexing more robust against reference loops
 
   Choose a thread root by date in case of reference loops. Fix a
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index f125302e..724b5e54 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.26.1'
+__VERSION__ = '0.26.2'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index 4e6cda69..2a05152f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.26.2-1) UNRELEASED; urgency=medium
+
+  * Break reference loops when indexing, fixes INTERNAL_ERROR in "notmuch show"
+  * Don't call get_mset(0,0,X), fixes crash on some gcc8 using distros
+
+ -- David Bremner <bremner@debian.org>  Thu, 26 Apr 2018 22:41:37 -0300
+
 notmuch (0.26.1-1) unstable; urgency=medium
 
   * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
diff --git a/lib/query.cc b/lib/query.cc
index d633fa3d..7fdf992d 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -652,9 +652,9 @@ _notmuch_query_count_documents (notmuch_query_t *query, const char *type, unsign
 	/*
 	 * Set the checkatleast parameter to the number of documents
 	 * in the database to make get_matches_estimated() exact.
-	 * Set the max parameter to 0 to avoid fetching documents we will discard.
+	 * Set the max parameter to 1 to avoid fetching documents we will discard.
 	 */
-	mset = enquire.get_mset (0, 0,
+	mset = enquire.get_mset (0, 1,
 				 notmuch->xapian_db->get_doccount ());
 
 	count = mset.get_matches_estimated();
diff --git a/version b/version
index 30f6cf8d..894542aa 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.26.1
+0.26.2