From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94F76C433F1 for ; Tue, 28 Jul 2020 16:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7AADE2053B for ; Tue, 28 Jul 2020 16:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731529AbgG1Qgl (ORCPT ); Tue, 28 Jul 2020 12:36:41 -0400 Received: from cloud.peff.net ([104.130.231.41]:39882 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731429AbgG1Qgk (ORCPT ); Tue, 28 Jul 2020 12:36:40 -0400 Received: (qmail 27687 invoked by uid 109); 28 Jul 2020 16:36:38 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Tue, 28 Jul 2020 16:36:38 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 26399 invoked by uid 111); 28 Jul 2020 16:36:38 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Tue, 28 Jul 2020 12:36:38 -0400 Authentication-Results: peff.net; auth=none Date: Tue, 28 Jul 2020 12:36:37 -0400 From: Jeff King To: git@vger.kernel.org Subject: [PATCH 1/3] log: drop "--cc implies -m" logic Message-ID: <20200728163637.GA2650252@coredump.intra.peff.net> References: <20200728163617.GA2649887@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200728163617.GA2649887@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 --- Just a cleanup that would be worth taking regardless of the rest of the series. builtin/log.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index d104d5c688..281d2ae8eb 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) -- 2.28.0.rc2.475.g53c7e1c7f4