[PATCH v2 6/6] emacs: make show set --exclude=false

2012-03-31 Thread Mark Walters
Show has to set --exclude=false to deal with cases where it is asked to show a single excluded message. It uses JSON so it can easily pass the exclude information to the user. --- emacs/notmuch-show.el |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-show

[PATCH v2 5/6] cli: move show to the new --exclude= option naming scheme.

2012-03-31 Thread Mark Walters
This moves notmuch show to the --exclude=(true|false) naming scheme. When exclude=false show returns all threads that match including those that only match in an excluded message. The excluded messages are flagged. When exclude=true the behaviour depends on whether --entire-thread is set. If it is

[PATCH v2 4/6] test: add some exclude tests

2012-03-31 Thread Mark Walters
Systematically test the exclude options for search. Also move the search existing exclude tests into the new test. There is some overlap between the two sets of tests but many of the existing ones are there because they triggered bugs in the past so I have kept them to ensure coverage. --- test/no

[PATCH v2 3/6] cli: move search to the new --exclude= naming scheme.

2012-03-31 Thread Mark Walters
This commit replaces the --no-exclude option with a --exclude=(true|false|flag) option. The default is to omit the excluded messages. The flag option only makes sense if output=summary (as otherwise there is nowhere to print the flag). In summary output exclude=false and exclude=flag give almost i

[PATCH v2 2/6] cli: move count to the new --exclude=(true|false|flag) naming scheme.

2012-03-31 Thread Mark Walters
Move the option --no-exclude to the --exclude= scheme. Since there is no way to flag messages only true and false are implemented. Note that, for consistency with other commands, this is implemented as a keyword option rather than a boolean option. --- man/man1/notmuch-count.1 |5 +++-- notmuc

[PATCH v2 1/6] lib: change default for notmuch_query_set_omit_excluded

2012-03-31 Thread Mark Walters
--- lib/notmuch.h | 11 ++- lib/query.cc | 10 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/notmuch.h b/lib/notmuch.h index babd208..029a2c3 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -449,12 +449,13 @@ typedef enum { const char * notmuch_qu

[PATCH v2 0/6] Move --no-exclude to --exclude=(true|false|flag)

2012-03-31 Thread Mark Walters
This is version 2 of the exclude= series (version 1 is [1]). The main changes are the addition of some systematic notmuch-search tests for all the exclude options, and I no longer add the exclude=flag option to notmuch-show.c (the output was too similar to exclude=false to be worth keeping). Best

[RFC] Split notmuch_database_close into two functions

2012-03-31 Thread Austin Clements
Quoth Justus Winter on Mar 21 at 1:55 am: > I propose to split the function notmuch_database_close into > notmuch_database_close and notmuch_database_destroy so that long > running processes like alot can close the database while still using > data obtained from queries to that database. Is this

Re: [RFC] Split notmuch_database_close into two functions

2012-03-31 Thread Austin Clements
Quoth Justus Winter on Mar 21 at 1:55 am: > I propose to split the function notmuch_database_close into > notmuch_database_close and notmuch_database_destroy so that long > running processes like alot can close the database while still using > data obtained from queries to that database. Is this

Unofficial notmuch wiki concerns

2012-03-31 Thread Kyle Sexton
Agreed, with a smaller community it'll be a detriment to have two places for information. I do think having to edit the wiki via git makes things harder overall, but that's another thread. I'll take down the site tonight. Thanks for the honest feedback. Sent from my iPhone On Mar 31, 2012, at

[BUG/PATCH v3 4/4] emacs: Fix the References header in reply

2012-03-31 Thread Adam Wolfe Gordon
In the new reply code, the References header gets inserted by message.el using a function called message-shorten-references. Unlike all the other header-inserting functions, it doesn't put a newline after the header, causing the next header to end up on the same line. In our case, this header happe

[BUG/PATCH v3 3/4] test: Show all headers in emacs reply tests

2012-03-31 Thread Adam Wolfe Gordon
By default, emacs hides the User-Agent and References headers when composing mail. This is a good thing for users, but a bad thing for testing, since we can create ugly or invalid headers and not have it show up in the tests. By setting message-hidden-headers to an empty list, we force emacs to sh

[BUG/PATCH v3 2/4] emacs: Fix two bugs in reply

2012-03-31 Thread Adam Wolfe Gordon
Bug 1: Replying from alternate addresses The reply code was inconsistent in its use of symbols and strings for header names being passed to message.el functions. This caused the >From header to be lookup up incorrectly, causing an additional From header to

[BUG/PATCH v3 1/4] test: Tests for reply from alternate addresses in emacs

2012-03-31 Thread Adam Wolfe Gordon
Since the recent reply changes were pushed, there has been a bug that causes emacs to always reply from the primary address, even if the JSON or default CLI reply output uses an alternate address. This adds two tests to the emacs test library based on the two "Reply form..." tests in the reply tes

[BUG/PATCH v3 0/4] Bug fixes for reply: three bugs, one series

2012-03-31 Thread Adam Wolfe Gordon
Hi everyone, This series is a combination of the three bugfixes I sent this week [1] [2]. As Mark pointed out, the fix for the emacs 23.2 bug actually fixes the alternate address bug as well, so there's no real reason to have a separate patch for it, especially one that implements a different fix.

[PATCH 1/7] Split notmuch_database_close into two functions

2012-03-31 Thread Mark Walters
Justus Winter <4winter at informatik.uni-hamburg.de> writes: > Formerly notmuch_database_close closed the xapian database and > destroyed the talloc structure associated with the notmuch database > object. Split notmuch_database_close into notmuch_database_close and > notmuch_database_destroy. > >

[BUG/PATCH v2 1/2] emacs: Fix header problem in reply for emacs 23.2

2012-03-31 Thread Adam Wolfe Gordon
Hi Mark, On Sat, Mar 31, 2012 at 03:13, Mark Walters wrote: > Secondly it seems a little odd that the second patch above changes the > header stuff from 'From to "From" and then this patch changes it back > again. This is probably only a matter of a tidy history but I have to > admit I am confus

[BUG/PATCH v3 1/4] test: Tests for reply from alternate addresses in emacs

2012-03-31 Thread Adam Wolfe Gordon
Since the recent reply changes were pushed, there has been a bug that causes emacs to always reply from the primary address, even if the JSON or default CLI reply output uses an alternate address. This adds two tests to the emacs test library based on the two "Reply form..." tests in the reply tes

[BUG/PATCH v3 2/4] emacs: Fix two bugs in reply

2012-03-31 Thread Adam Wolfe Gordon
Bug 1: Replying from alternate addresses The reply code was inconsistent in its use of symbols and strings for header names being passed to message.el functions. This caused the >From header to be lookup up incorrectly, causing an additional From header to

[BUG/PATCH v3 3/4] test: Show all headers in emacs reply tests

2012-03-31 Thread Adam Wolfe Gordon
By default, emacs hides the User-Agent and References headers when composing mail. This is a good thing for users, but a bad thing for testing, since we can create ugly or invalid headers and not have it show up in the tests. By setting message-hidden-headers to an empty list, we force emacs to sh

[BUG/PATCH v3 4/4] emacs: Fix the References header in reply

2012-03-31 Thread Adam Wolfe Gordon
In the new reply code, the References header gets inserted by message.el using a function called message-shorten-references. Unlike all the other header-inserting functions, it doesn't put a newline after the header, causing the next header to end up on the same line. In our case, this header happe

[BUG/PATCH v3 0/4] Bug fixes for reply: three bugs, one series

2012-03-31 Thread Adam Wolfe Gordon
Hi everyone, This series is a combination of the three bugfixes I sent this week [1] [2]. As Mark pointed out, the fix for the emacs 23.2 bug actually fixes the alternate address bug as well, so there's no real reason to have a separate patch for it, especially one that implements a different fix.

Re: Unofficial notmuch wiki concerns

2012-03-31 Thread Jameson Graef Rollins
On Sat, Mar 31 2012, Kyle Sexton wrote: > Agreed, with a smaller community it'll be a detriment to have two > places for information. I do think having to edit the wiki via git > makes things harder overall, but that's another thread. I'll take down > the site tonight. Thanks for the honest feedba

Unofficial notmuch wiki concerns

2012-03-31 Thread Jameson Graef Rollins
On Sat, Mar 31 2012, Kyle Sexton wrote: > Agreed, with a smaller community it'll be a detriment to have two > places for information. I do think having to edit the wiki via git > makes things harder overall, but that's another thread. I'll take down > the site tonight. Thanks for the honest feedba

Re: Unofficial notmuch wiki concerns

2012-03-31 Thread Kyle Sexton
Agreed, with a smaller community it'll be a detriment to have two places for information. I do think having to edit the wiki via git makes things harder overall, but that's another thread. I'll take down the site tonight. Thanks for the honest feedback. Sent from my iPhone On Mar 31, 2012, at

Re: [BUG/PATCH v2 1/2] emacs: Fix header problem in reply for emacs 23.2

2012-03-31 Thread Adam Wolfe Gordon
Hi Mark, On Sat, Mar 31, 2012 at 03:13, Mark Walters wrote: > Secondly it seems a little odd that the second patch above changes the > header stuff from 'From to "From" and then this patch changes it back > again. This is probably only a matter of a tidy history but I have to > admit I am confuse

[PATCH v2 4/6] test: add some exclude tests

2012-03-31 Thread Mark Walters
Systematically test the exclude options for search. Also move the search existing exclude tests into the new test. There is some overlap between the two sets of tests but many of the existing ones are there because they triggered bugs in the past so I have kept them to ensure coverage. --- test/no

[PATCH v2 6/6] emacs: make show set --exclude=false

2012-03-31 Thread Mark Walters
Show has to set --exclude=false to deal with cases where it is asked to show a single excluded message. It uses JSON so it can easily pass the exclude information to the user. --- emacs/notmuch-show.el |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-show

[PATCH v2 5/6] cli: move show to the new --exclude= option naming scheme.

2012-03-31 Thread Mark Walters
This moves notmuch show to the --exclude=(true|false) naming scheme. When exclude=false show returns all threads that match including those that only match in an excluded message. The excluded messages are flagged. When exclude=true the behaviour depends on whether --entire-thread is set. If it is

[PATCH v2 3/6] cli: move search to the new --exclude= naming scheme.

2012-03-31 Thread Mark Walters
This commit replaces the --no-exclude option with a --exclude=(true|false|flag) option. The default is to omit the excluded messages. The flag option only makes sense if output=summary (as otherwise there is nowhere to print the flag). In summary output exclude=false and exclude=flag give almost i

[PATCH v2 2/6] cli: move count to the new --exclude=(true|false|flag) naming scheme.

2012-03-31 Thread Mark Walters
Move the option --no-exclude to the --exclude= scheme. Since there is no way to flag messages only true and false are implemented. Note that, for consistency with other commands, this is implemented as a keyword option rather than a boolean option. --- man/man1/notmuch-count.1 |5 +++-- notmuc

[PATCH v2 1/6] lib: change default for notmuch_query_set_omit_excluded

2012-03-31 Thread Mark Walters
--- lib/notmuch.h | 11 ++- lib/query.cc | 10 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/notmuch.h b/lib/notmuch.h index babd208..029a2c3 100644 --- a/lib/notmuch.h +++ b/lib/notmuch.h @@ -449,12 +449,13 @@ typedef enum { const char * notmuch_qu

[PATCH v2 0/6] Move --no-exclude to --exclude=(true|false|flag)

2012-03-31 Thread Mark Walters
This is version 2 of the exclude= series (version 1 is [1]). The main changes are the addition of some systematic notmuch-search tests for all the exclude options, and I no longer add the exclude=flag option to notmuch-show.c (the output was too similar to exclude=false to be worth keeping). Best

Re: Unofficial notmuch wiki concerns

2012-03-31 Thread Jameson Graef Rollins
On Mon, Mar 26 2012, Kyle Sexton wrote: > I wanted to get everyone's thoughts on something I setup over this past > weekend. I put up a site at http://notmuchwiki.org with notes I took > while getting started with notmuch[1], along with a skeleton for more > information that I'll be updating as I

Unofficial notmuch wiki concerns

2012-03-31 Thread Jameson Graef Rollins
ail.org/pipermail/notmuch/attachments/20120331/451a4426/attachment-0001.pgp>

[PATCH 6/8] cli: add support for batch tagging operations to "notmuch tag"

2012-03-31 Thread Jani Nikula
Add support for batch tagging operations through stdin to "notmuch tag". This can be enabled with the new --stdin command line option to "notmuch new". The input must consist of lines of the format: T +|- [...] [--] Each line is interpreted similarly to "notmuch tag" command line arguments. The

[PATCH 8/8] man: document notmuch tag --stdin option

2012-03-31 Thread Jani Nikula
--- man/man1/notmuch-tag.1 | 44 +++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index aa4546e..30693cf 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -4,7 +4,11 @@ n

[PATCH 7/8] test: add test for notmuch tag --stdin option

2012-03-31 Thread Jani Nikula
--- test/tagging | 13 + 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/test/tagging b/test/tagging index e4782ed..15eb42d 100755 --- a/test/tagging +++ b/test/tagging @@ -46,4 +46,17 @@ test_expect_equal "$output" "\ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite

[PATCH 5/8] test/hex-escaping: new test for hex escaping routines

2012-03-31 Thread Jani Nikula
From: David Bremner These are more like unit tests, to (try to) make sure the library functionality is working before building more complicated things on top of it. --- test/hex-escaping | 26 ++ test/notmuch-test |1 + 2 files changed, 27 insertions(+), 0 deletions

[PATCH 4/8] test/hex-xcode: new test binary

2012-03-31 Thread Jani Nikula
From: David Bremner This program is used both as a test-bed/unit-tester for ../util/hex-escape.c, and also as a utility in future tests of dump and restore. --- test/.gitignore |1 + test/Makefile.local |6 ++- test/basic |2 +- test/hex-xcode.c| 103 +++

[PATCH 3/8] hex-escape: add function to decode escaped string in-place

2012-03-31 Thread Jani Nikula
Add function hex_decode_inplace() to decode the input string onto itself. Signed-off-by: Jani Nikula --- This could be folded to "hex-escape: (en|de)code strings to/from restricted character set". --- util/hex-escape.c | 62 ++-- util/hex-escap

[PATCH 2/8] hex-escape: be more strict about the format while decoding

2012-03-31 Thread Jani Nikula
Signed-off-by: Jani Nikula --- This could be folded to "hex-escape: (en|de)code strings to/from restricted character set". --- util/hex-escape.c |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util/hex-escape.c b/util/hex-escape.c index 6c1260b..9de79df 100644 ---

[PATCH 1/8] hex-escape: (en|de)code strings to/from restricted character set

2012-03-31 Thread Jani Nikula
From: David Bremner The character set is chosen to be suitable for pathnames, and the same as that used by contrib/nmbug --- util/Makefile.local |2 +- util/hex-escape.c | 156 +++ util/hex-escape.h | 32 +++ 3 files changed, 189

[PATCH 0/8] batch tagging support: "notmuch tag --stdin"

2012-03-31 Thread Jani Nikula
Hi all, this series adds support for batch tagging through stdin to "notmuch tag". This should be useful and efficient for e.g. initial tagging scripts. See the test patch for an example using a "here document". The hex escaping routines are by David; my additions to them are in separate patches,

Re: [PATCH v2 2/5] test: Add tests for 'config' command

2012-03-31 Thread Jameson Graef Rollins
On Sat, Mar 31 2012, Mark Walters wrote: > It seems off to call is success without checking that the value has > actually been set. Of course it is checked in the notmuch config list > test introduced in the next commit but I think if it would be better to > check with notmuch config get here too

[PATCH v2 2/5] test: Add tests for 'config' command

2012-03-31 Thread Jameson Graef Rollins
bytes Desc: not available URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20120331/c6d75a61/attachment.pgp>

[PATCH 1/7] Split notmuch_database_close into two functions

2012-03-31 Thread David Bremner
Mark Walters writes: > The first is a concern that if we change the library functions we should > update the library version otherwise out of tree users won't know which > to call. This is not such a big deal. We can update the SONAME of the library so that old code will continute to dynamicall

[PATCH v2]: contrib/notmuch-mutt

2012-03-31 Thread Stefano Zacchiroli
diff Size: 1007 bytes Desc: not available URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20120331/1a9e8c8f/attachment.patch> -- next part -- A non-text attachment was scrubbed... Name: 0002-notmuch-mutt-fix-typo-in-manpage.patch Type: text/x-diff Size: 75

Re: [PATCH 1/7] Split notmuch_database_close into two functions

2012-03-31 Thread David Bremner
Mark Walters writes: > The first is a concern that if we change the library functions we should > update the library version otherwise out of tree users won't know which > to call. This is not such a big deal. We can update the SONAME of the library so that old code will continute to dynamicall

Re: [PATCH 1/7] Split notmuch_database_close into two functions

2012-03-31 Thread Mark Walters
Justus Winter <4win...@informatik.uni-hamburg.de> writes: > Formerly notmuch_database_close closed the xapian database and > destroyed the talloc structure associated with the notmuch database > object. Split notmuch_database_close into notmuch_database_close and > notmuch_database_destroy. > > Th

[PATCH v2 5/5] man: Document 'config list' command

2012-03-31 Thread Peter Wang
Document the 'config list' command and its output. --- man/man1/notmuch-config.1 | 14 ++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 395cb9c..a55dbef 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1

[PATCH v2 4/5] config: Add 'config list' command

2012-03-31 Thread Peter Wang
Add a command to list all configuration items with their associated values. One use is as follows: a MUA may prefer to store data in a central notmuch configuration file so that the data is accessible across different machines, e.g. an addressbook. The list command helps to implement features suc

[PATCH v2 3/5] test: Add broken test for 'config list'

2012-03-31 Thread Peter Wang
Proposed functionality. --- test/config | 16 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/test/config b/test/config index d3e574c..73c58ff 100755 --- a/test/config +++ b/test/config @@ -17,4 +17,20 @@ test_expect_success "Set string value" \ test_expect_succ

[PATCH v2 2/5] test: Add tests for 'config' command

2012-03-31 Thread Peter Wang
Start a new test script. --- test/config | 20 test/notmuch-test |1 + 2 files changed, 21 insertions(+), 0 deletions(-) create mode 100755 test/config diff --git a/test/config b/test/config new file mode 100755 index 000..d3e574c --- /dev/null +++ b/test/con

[PATCH v2 1/5] config: Fix free in 'config get' implementation.

2012-03-31 Thread Peter Wang
The array returned by g_key_file_get_string_list() should be freed with g_strfreev(), not free(). --- notmuch-config.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/notmuch-config.c b/notmuch-config.c index e9b2750..85fc774 100644 --- a/notmuch-config.c +++ b/notmuch-co

[PATCH v2] Add 'config list' command

2012-03-31 Thread Peter Wang
This version prints all config items and their values instead of just the keys of a single section.

[BUG/PATCH v2 1/2] emacs: Fix header problem in reply for emacs 23.2

2012-03-31 Thread Mark Walters
Adam Wolfe Gordon writes: > The new reply code used strings instead of symbols for header names, > which message-mail is OK with on emacs 23.3, but not 23.2. The symptom > is that on 23.2 (and presumably on earlier versions) the reply message > would end up with two of some headers. > > This fixe

[PATCH] contrib/nmbug: use "resolve" merge strategy

2012-03-31 Thread da...@tethera.net
From: David Bremner The recursive merge strategy does rename detection, which yields false positives (and hence spurious merge conflicts) when merging trees of empty files. --- An unresolved issue (ho ho) is the fact that failed merge operations are still not detected. This needs more thought,

[PATCH v2 2/5] test: Add tests for 'config' command

2012-03-31 Thread Mark Walters
This whole series looks good to me with one minor query. > Start a new test script. > --- > test/config | 20 > test/notmuch-test |1 + > 2 files changed, 21 insertions(+), 0 deletions(-) > create mode 100755 test/config > > diff --git a/test/config b/test/confi

[PATCH] emacs: Fix mis-named argument to notmuch-get-bodypart-internal

2012-03-31 Thread David Bremner
Austin Clements writes: > Previously, this function took an argument called "message-id", even > though it was a general query, rather than a message ID. This changes > it to "query". Pushed, d

[PATCH] emacs: Fix mis-named argument to notmuch-get-bodypart-internal

2012-03-31 Thread David Bremner
Austin Clements writes: > Previously, this function took an argument called "message-id", even > though it was a general query, rather than a message ID. This changes > it to "query". pushed, d

[PATCH v2 0/3] Rewrite default reply format

2012-03-31 Thread David Bremner
Austin Clements writes: > This version fixes two minor formatting issues that Tomi pointed out > [1]. There are no other changes. > > [1] id:"m2d382ia9d.fsf at guru.guru-group.fi" pushed, d

[PATCH] contrib/nmbug: use "resolve" merge strategy

2012-03-31 Thread david
From: David Bremner The recursive merge strategy does rename detection, which yields false positives (and hence spurious merge conflicts) when merging trees of empty files. --- An unresolved issue (ho ho) is the fact that failed merge operations are still not detected. This needs more thought,

Re: [PATCH] emacs: Fix mis-named argument to notmuch-get-bodypart-internal

2012-03-31 Thread David Bremner
Austin Clements writes: > Previously, this function took an argument called "message-id", even > though it was a general query, rather than a message ID. This changes > it to "query". Pushed, d ___ notmuch mailing list notmuch@notmuchmail.org http://

Re: [PATCH] emacs: Fix mis-named argument to notmuch-get-bodypart-internal

2012-03-31 Thread David Bremner
Austin Clements writes: > Previously, this function took an argument called "message-id", even > though it was a general query, rather than a message ID. This changes > it to "query". pushed, d ___ notmuch mailing list notmuch@notmuchmail.org http:/

Re: [PATCH v2 0/3] Rewrite default reply format

2012-03-31 Thread David Bremner
Austin Clements writes: > This version fixes two minor formatting issues that Tomi pointed out > [1]. There are no other changes. > > [1] id:"m2d382ia9d@guru.guru-group.fi" pushed, d ___ notmuch mailing list notmuch@notmuchmail.org http://notmuc

[PATCH 1/2] test: add broken test for long names in Emacs notmuch-hello view

2012-03-31 Thread Dmitry Kurochkin
Hi all. It has been a while since these patches were posted. They are pretty simple, just a single line (and a single char) is changed in actual code. So I am going to remove the needs-review tag. Regards, Dmitry

Re: [BUG/PATCH v2 1/2] emacs: Fix header problem in reply for emacs 23.2

2012-03-31 Thread Mark Walters
Adam Wolfe Gordon writes: > The new reply code used strings instead of symbols for header names, > which message-mail is OK with on emacs 23.3, but not 23.2. The symptom > is that on 23.2 (and presumably on earlier versions) the reply message > would end up with two of some headers. > > This fixe

Re: [PATCH v2]: contrib/notmuch-mutt

2012-03-31 Thread Stefano Zacchiroli
On Fri, Mar 30, 2012 at 09:35:41PM -0300, David Bremner wrote: > > I tried out these patches, and they seem to work (to the limit of my > > mutt knowledge). I did notice a minor grammar issue in the DESCRIPTION > > of the man page, "capable of populating maildir" should be "a maildir" > > or "mail

Re: [PATCH v2 2/5] test: Add tests for 'config' command

2012-03-31 Thread Mark Walters
This whole series looks good to me with one minor query. > Start a new test script. > --- > test/config | 20 > test/notmuch-test |1 + > 2 files changed, 21 insertions(+), 0 deletions(-) > create mode 100755 test/config > > diff --git a/test/config b/test/confi