From 344e4c65a43e0755506e065ec001df8b1eae91f7 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 25 Aug 2014 13:25:59 -0400 Subject: [PATCH] new: Don't report version after upgrade The version number has always been pretty meaningless to the user and it's about to become even more meaningless with the introduction of "features". Hopefully, the database will remain on version 3 for some time to come; however, the introduction of new features over time in version 3 will necessitate upgrades within version 3. It would be confusing if we always tell the user they've been "upgraded to version 3". If the user wants to know what's new, they should read the news. --- notmuch-new.c | 3 +-- test/T530-upgrade.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/notmuch-new.c b/notmuch-new.c index 56910056..ddf42c14 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -1031,8 +1031,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) return EXIT_FAILURE; } if (add_files_state.verbosity >= VERBOSITY_NORMAL) - printf ("Your notmuch database has now been upgraded to database format version %u.\n", - notmuch_database_get_version (notmuch)); + printf ("Your notmuch database has now been upgraded.\n"); } add_files_state.total_files = 0; diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh index 7d5d5aa8..c4c4ac8b 100755 --- a/test/T530-upgrade.sh +++ b/test/T530-upgrade.sh @@ -33,7 +33,7 @@ test_expect_equal "$output" "\ Welcome to a new version of notmuch! Your database will now be upgraded. This process is safe to interrupt. Backing up tags to FILENAME -Your notmuch database has now been upgraded to database format version 2. +Your notmuch database has now been upgraded. No new mail." test_begin_subtest "tag backup matches pre-upgrade dump"