Merge branch 'release'

diff --git a/lib/open.cc b/lib/open.cc
index 005872dc2c5877d5f0ac483b0ef2cec19b2ca85c..463e38bf0d8f733fe933da033ab993d828255fb7 100644 (file)
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -249,6 +249,11 @@ _choose_database_path (notmuch_database_t *notmuch,
        return NOTMUCH_STATUS_NO_DATABASE;
     }
 
+    if (*message) {
+       free (*message);
+       *message = NULL;
+    }
+
     return NOTMUCH_STATUS_SUCCESS;
 }
 

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index efc79e8b089ddcb4abe107136c8412f4e89c5f01..1feb5624c41b8af06fab0750f7bc70395b7a4504 100755 (executable)
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -374,6 +374,11 @@ EOF
           notmuch new
           test_expect_equal "$(xapian-metadata get ${XAPIAN_PATH} version)" 3
           ;;
+       home_mail|maildir_env)
+          test_begin_subtest "No errors from config list ($config)"
+          notmuch config list 2>OUTPUT 1>/dev/null
+          test_expect_equal_file /dev/null OUTPUT
+          ;;
        *)
           backup_database
           test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"