summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-08-01 21:48:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-02 16:55:03 (GMT)
commitf3eda90ffc10f9152e7492a34408a9f5e4c28b0f (patch)
tree3deaa1b8cc91d4fe1551913927a009cc67390b15 /builtin/log.c
parent7ed20f596bde016ba199b82747108a431368f15a (diff)
downloadgit-f3eda90ffc10f9152e7492a34408a9f5e4c28b0f.zip
git-f3eda90ffc10f9152e7492a34408a9f5e4c28b0f.tar.gz
git-f3eda90ffc10f9152e7492a34408a9f5e4c28b0f.tar.bz2
log: really flip the --mailmap default
Update the docs, test the interaction between the new default, configuration and command line option, in addition to actually flipping the default. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 40b4cbf..44b10b3 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -47,7 +47,7 @@ static int default_follow;
static int default_show_signature;
static int decoration_style;
static int decoration_given;
-static int use_mailmap_config = -1;
+static int use_mailmap_config = 1;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
@@ -160,7 +160,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
struct rev_info *rev, struct setup_revision_opt *opt)
{
struct userformat_want w;
- int quiet = 0, source = 0, mailmap = 0;
+ int quiet = 0, source = 0, mailmap;
static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
@@ -204,9 +204,6 @@ 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)
- mailmap = 0;
-
if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
rev->show_notes = 1;
if (rev->show_notes)