Merge branch 'release'

diff --git a/NEWS b/NEWS
index 18252e4aef27cd9e79e4146b7939a0e2afd0230e..384f5a02de3d056f36cfd1cb213fa70cffff5574 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Notmuch 0.10.1 (2011-11-25)
+===========================
+
+Bug-fix release.
+----------------
+
+Fix --help argument
+
+  Argument processing changes in 0.10 introduced a bug where "notmuch
+  --help" crashed while "notmuch help" worked fine. This is fixed in
+  0.10.1.
+
 Notmuch 0.10 (2011-11-23)
 =========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index d1e58361391722986cfcd6dc8332748e56cd8e18..a6a872ebaebf674a0ff3041471e058d68284333b 100644 (file)
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,2 +1,2 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.10'
+__VERSION__ = '0.10.1'

diff --git a/debian/changelog b/debian/changelog
index d0d144e96e7e910ba60f49f324b217b34c6cc4ca..ac5c3314d10c0f7c5a610b2d61f1e248ef2b7c60 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.10.1-1) unstable; urgency=low
+
+  * Upstream bug fix release.
+    - Fix segfault on "notmuch --help"
+
+ -- David Bremner <bremner@debian.org>  Fri, 25 Nov 2011 12:11:30 -0500
+
 notmuch (0.10-1) unstable; urgency=low
 
   * New upstream release

diff --git a/notmuch.1 b/notmuch.1
index d64dd1e78f3672ebb8be16ce4165c9c814e43bc5..92931d73a998b3b18725da231830ab6408699b17 100644 (file)
--- a/notmuch.1
+++ b/notmuch.1
@@ -16,7 +16,7 @@
 .\" along with this program.  If not, see http://www.gnu.org/licenses/ .
 .\"
 .\" Author: Carl Worth <cworth@cworth.org>
-.TH NOTMUCH 1 2011-11-23 "Notmuch 0.10"
+.TH NOTMUCH 1 2011-11-25 "Notmuch 0.10.1"
 .SH NAME
 notmuch \- thread-based email index, search, and tagging
 .SH SYNOPSIS

diff --git a/notmuch.c b/notmuch.c
index 77973f80213e0f87c7c45dc088f4257b9ca49115..d44ce9a0da18fced2dd36a474f51d496b85013cf 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -621,7 +621,7 @@ main (int argc, char *argv[])
        return notmuch (local);
 
     if (STRNCMP_LITERAL (argv[1], "--help") == 0)
-       return notmuch_help_command (NULL, 0, NULL);
+       return notmuch_help_command (NULL, argc - 1, &argv[1]);
 
     if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
        printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");

diff --git a/test/help-test b/test/help-test
new file mode 100755 (executable)
index 0000000..9f4b9c7
--- /dev/null
+++ b/test/help-test
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+test_description="online help"
+. test-lib.sh
+
+test_expect_success 'notmuch --help' 'notmuch --help'
+test_expect_success 'notmuch --help tag' 'notmuch --help tag'
+test_expect_success 'notmuch help' 'notmuch help'
+test_expect_success 'notmuch help tag' 'notmuch help tag'
+test_expect_success 'notmuch --version' 'notmuch --version'
+
+test_done

diff --git a/test/notmuch-test b/test/notmuch-test
index 6c65ed7a282bed731cc5bd4bbf0ce5196ee84dbd..ba28ff3908e4d415f0bbbdf4ea11f6b5d99f6570 100755 (executable)
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -18,6 +18,7 @@ cd $(dirname "$0")
 
 TESTS="
   basic
+  help-test
   new
   count
   search

diff --git a/version b/version
index 68c123cf10e0a36b6036c9fbc30275960d19e749..571215736a666e8d79d7a7958b5ffc400514fb53 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.10
+0.10.1