mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 18:38:08 +01:00
Merge branch 'release'
This commit is contained in:
commit
ac8576de63
8 changed files with 36 additions and 4 deletions
12
NEWS
12
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)
|
||||
=========================
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# this file should be kept in sync with ../../../version
|
||||
__VERSION__ = '0.10'
|
||||
__VERSION__ = '0.10.1'
|
||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -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");
|
||||
|
|
12
test/help-test
Executable file
12
test/help-test
Executable file
|
@ -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
|
|
@ -18,6 +18,7 @@ cd $(dirname "$0")
|
|||
|
||||
TESTS="
|
||||
basic
|
||||
help-test
|
||||
new
|
||||
count
|
||||
search
|
||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
|||
0.10
|
||||
0.10.1
|
||||
|
|
Loading…
Reference in a new issue