Merge branch 'release'

This commit is contained in:
David Bremner 2023-12-06 07:39:24 -04:00
commit 52a5446150
2 changed files with 10 additions and 0 deletions

View file

@ -249,6 +249,11 @@ _choose_database_path (notmuch_database_t *notmuch,
return NOTMUCH_STATUS_NO_DATABASE; return NOTMUCH_STATUS_NO_DATABASE;
} }
if (*message) {
free (*message);
*message = NULL;
}
return NOTMUCH_STATUS_SUCCESS; return NOTMUCH_STATUS_SUCCESS;
} }

View file

@ -374,6 +374,11 @@ EOF
notmuch new notmuch new
test_expect_equal "$(xapian-metadata get ${XAPIAN_PATH} version)" 3 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 backup_database
test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)" test_begin_subtest ".notmuch without xapian/ handled gracefully ($config)"