From eed5332a13ef15391039e5e953462201978058ec Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 29 Jul 2020 16:10:17 -0400 Subject: log: drop "--cc implies -m" logic This was added by 82dee4160c (log: show merge commit when --cc is given, 2015-08-20), which explains why we need it. But that commit failed to notice that setup_revisions() already does the same thing, since cd2bdc5309 (Common option parsing for "git log --diff" and friends, 2006-04-14). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano diff --git a/builtin/log.c b/builtin/log.c index d104d5c..281d2ae 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -731,10 +731,6 @@ static void log_setup_revisions_tweak(struct rev_info *rev, /* Turn --cc/-c into -p --cc/-c when -p was not given */ if (!rev->diffopt.output_format && rev->combine_merges) rev->diffopt.output_format = DIFF_FORMAT_PATCH; - - /* Turn -m on when --cc/-c was given */ - if (rev->combine_merges) - rev->ignore_merges = 0; } int cmd_log(int argc, const char **argv, const char *prefix) -- cgit v0.10.2-6-g49f6