From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id CCB0D1F4B4 for ; Thu, 8 Apr 2021 11:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbhDHLsZ (ORCPT ); Thu, 8 Apr 2021 07:48:25 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:30358 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbhDHLsZ (ORCPT ); Thu, 8 Apr 2021 07:48:25 -0400 Received: from host-92-1-139-132.as43234.net ([92.1.139.132] helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1lUT8u-0004aF-EI; Thu, 08 Apr 2021 12:48:12 +0100 Subject: Re: [PATCH 1/9] diff-merges: introduce --diff-merges=def To: Sergey Organov , Junio C Hamano Cc: Jeff King , Elijah Newren , Felipe Contreras , git@vger.kernel.org References: <20210407225608.14611-1-sorganov@gmail.com> <20210407225608.14611-2-sorganov@gmail.com> From: Philip Oakley Message-ID: Date: Thu, 8 Apr 2021 12:48:11 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210407225608.14611-2-sorganov@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi, On 07/04/2021 23:56, Sergey Organov wrote: > Introduce the notion of default diff format for merges, and the option > "def" to select it. The default is "separate" and can't yet be "def" feels a bit too short and sounds similar to "define" - why not spell out in full? > changed, so effectively "dev" is just a synonym for "separate" for did you mean "def"?  i.e. s/dev/def/   (..spell out in full ;-) -- Philip > now. > > This is in preparation for introducing log.diffMerges configuration > option that will let --diff-merges=def to be configured to any > supported format. > > Signed-off-by: Sergey Organov > --- > diff-merges.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/diff-merges.c b/diff-merges.c > index 146bb50316a6..0887a07cfc67 100644 > --- a/diff-merges.c > +++ b/diff-merges.c > @@ -2,6 +2,8 @@ > > #include "revision.h" > > +typedef void (*diff_merges_setup_func_t)(struct rev_info *); > + > static void suppress(struct rev_info *revs) > { > revs->separate_merges = 0; > @@ -19,6 +21,8 @@ static void set_separate(struct rev_info *revs) > revs->separate_merges = 1; > } > > +static diff_merges_setup_func_t set_to_default = set_separate; > + > static void set_first_parent(struct rev_info *revs) > { > set_separate(revs); > @@ -66,6 +70,8 @@ static void set_diff_merges(struct rev_info *revs, const char *optarg) > set_combined(revs); > else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined")) > set_dense_combined(revs); > + else if (!strcmp(optarg, "def")) > + set_to_default(revs); > else > die(_("unknown value for --diff-merges: %s"), optarg); >