log: flip the --mailmap default unconditionally

diff --git a/builtin/log.c b/builtin/log.c
index 1cf9e37736a65d85c2b095469253ed0c400be44d..40b4cbf57de394ac916648ca6970db3286e800be 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
                parse_date_format(default_date_mode, &rev->date_mode);
 }
 
-static char warn_unspecified_mailmap_msg[] =
-N_("log.mailmap is not set; its implicit value will change in an\n"
-   "upcoming release. To squelch this message and preserve current\n"
-   "behaviour, set the log.mailmap configuration value to false.\n"
-   "\n"
-   "To squelch this message and adopt the new behaviour now, set the\n"
-   "log.mailmap configuration value to true.\n"
-   "\n"
-   "See 'git help config' and search for 'log.mailmap' for further information.");
-
 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
                         struct rev_info *rev, struct setup_revision_opt *opt)
 {
@@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
        memset(&w, 0, sizeof(w));
        userformat_find_requirements(NULL, &w);
 
-       if (mailmap < 0) {
-               if (session_is_interactive() && !rev->pretty_given)
-                       warning("%s\n", _(warn_unspecified_mailmap_msg));
-
+       if (mailmap < 0)
                mailmap = 0;
-       }
 
        if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
                rev->show_notes = 1;