From 879c2a57a07edd7a10bf1ef277aeb6a57fc9e300 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 24 Nov 2011 16:02:41 -0400 Subject: CLI: update call to notmuch_help_command for new calling conventions. When I changed the calling convention to pass in all but the zero-th argument to subcommands, I missed this one call, resulting in a segmentation fault. As a bonus, the syntax "notmuch --help foo" is now equivalent to "notmuch help foo". --- notmuch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notmuch.c b/notmuch.c index 77973f80..d44ce9a0 100644 --- 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"); -- cgit v1.2.3 From f3ad20b20a1be5eac3c1de9b2814dbec8664e721 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 Nov 2011 12:11:04 -0500 Subject: version: update to 0.10.1 --- bindings/python/notmuch/version.py | 2 +- notmuch.1 | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/notmuch.1 b/notmuch.1 index d64dd1e7..92931d73 100644 --- 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 -.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/version b/version index 68c123cf..57121573 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.10 +0.10.1 -- cgit v1.2.3 From b62eea177d112b1fb7563ced6fd15dfe5ae848f7 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 Nov 2011 12:13:01 -0500 Subject: debian: changelog stanza for 0.10.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) 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 Fri, 25 Nov 2011 12:11:30 -0500 + notmuch (0.10-1) unstable; urgency=low * New upstream release -- cgit v1.2.3 From c0d8ebe36ea7ab087a8d71ad17116230a51a1cbf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 Nov 2011 12:17:35 -0500 Subject: NEWS: add NEWS stanza for 0.10.1 Explain the bug fix in slightly less technical language than in the Debian changelog. --- NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS b/NEWS index 18252e4a..384f5a02 100644 --- 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) ========================= -- cgit v1.2.3 From 398b94bb394e2be0633175b58b47451bc3ba98ca Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 Nov 2011 12:28:11 -0500 Subject: test: add simple tests for online help Nothing fancy, but we can at least detect segmentation faults. --- test/help-test | 12 ++++++++++++ test/notmuch-test | 1 + 2 files changed, 13 insertions(+) create mode 100755 test/help-test 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 adfd589f..5aced5ce 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -18,6 +18,7 @@ cd $(dirname "$0") TESTS=" basic + help-test new count search -- cgit v1.2.3