kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

log: add warning for unspecified log.mailmap setting 

Based on discussions around changing the log.mailmap default to being
enabled, it was decided that a transitional period is required.

Accordingly, we announce this transitional period with a warning
message.

Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ariadne Conill 2019-07-15 07:41:04 -05:00 committed by Junio C Hamano
parent 9d418600f4
commit f0596ecc8d
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/log.c
View File

@ -47,7 +47,7 @@ static int default_follow;
static int default_show_signature; static int default_show_signature;
static int decoration_style; static int decoration_style;
static int decoration_given; static int decoration_given;
static int use_mailmap_config; static int use_mailmap_config = -1;
static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty; static const char *fmt_pretty;


@ -63,9 +63,14 @@ struct line_opt_callback_data {
struct string_list args; struct string_list args;
}; };


static int session_is_interactive(void)
{
return isatty(1) || pager_in_use();
}

static int auto_decoration_style(void) static int auto_decoration_style(void)
{ {
return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0; return session_is_interactive() ? DECORATE_SHORT_REFS : 0;
} }


static int parse_decoration_style(const char *value) static int parse_decoration_style(const char *value)
@ -151,6 +156,16 @@ static void cmd_log_init_defaults(struct rev_info *rev)
parse_date_format(default_date_mode, &rev->date_mode); 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, static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
struct rev_info *rev, struct setup_revision_opt *opt) struct rev_info *rev, struct setup_revision_opt *opt)
{ {
@ -199,6 +214,13 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
memset(&w, 0, sizeof(w)); memset(&w, 0, sizeof(w));
userformat_find_requirements(NULL, &w); userformat_find_requirements(NULL, &w);


if (mailmap < 0) {
if (session_is_interactive() && !rev->pretty_given)
warning("%s\n", _(warn_unspecified_mailmap_msg));

mailmap = 0;
}

if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
rev->show_notes = 1; rev->show_notes = 1;
if (rev->show_notes) if (rev->show_notes)