diff options
-rw-r--r-- | NEWS | 12 | ||||
-rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | notmuch.1 | 2 | ||||
-rw-r--r-- | notmuch.c | 2 | ||||
-rwxr-xr-x | test/help-test | 12 | ||||
-rwxr-xr-x | test/notmuch-test | 1 | ||||
-rw-r--r-- | version | 2 |
8 files changed, 36 insertions, 4 deletions
@@ -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 d1e58361..a6a872eb 100644 --- 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 d0d144e9..ac5c3314 100644 --- 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 @@ -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 @@ -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 index 00000000..9f4b9c79 --- /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 6c65ed7a..ba28ff39 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -18,6 +18,7 @@ cd $(dirname "$0") TESTS=" basic + help-test new count search @@ -1 +1 @@ -0.10 +0.10.1 |