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-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 0CFD11F4B4 for ; Fri, 18 Dec 2020 16:14:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729980AbgLRQNh (ORCPT ); Fri, 18 Dec 2020 11:13:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727608AbgLRQNh (ORCPT ); Fri, 18 Dec 2020 11:13:37 -0500 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4285CC0617A7 for ; Fri, 18 Dec 2020 08:12:57 -0800 (PST) Received: by mail-ot1-x336.google.com with SMTP id o11so2371906ote.4 for ; Fri, 18 Dec 2020 08:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=e6JaD/leDX8lS7ULWY+3gGUwDndEYtgMGAOHPRjP1Tg=; b=Mn76vaJFYRyKbgmSvJoaNseQ1BkvJ/pZlD5eguas2Nar3yo8qjRBynhlTLLahAL7QM QsBv6B+gEsa4Ajnh4bdO5pQKw8eiehf+ma1nuKC5OHAmiP7saScT/lF7JEyFdX8wCAy4 JX6/iTeNi35DvAE+SdF94Ck9NLBbE4uKYLaCjBzJaocjsGT1VFMuxtbZdXWPA4vypSuH GjHseCHIaSDR20XTGYfnZKUmedxHwQslkfvG4mXUancTbiqOxpQgFxQhm4R7xYG7MkCB WVHJ/4TWgcujezZM/mQk2QVeEn1ZOjnsYgIuzuuiqRPkDdGWWrK75zNxPD+murCutwyU wryA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=e6JaD/leDX8lS7ULWY+3gGUwDndEYtgMGAOHPRjP1Tg=; b=SSO0ze38fJx2xWxVLPyDbilRE1SqvW0SyPeF2IarxmS/4DI7srSywR0kWeB6jUVg6z Bka5IqgV05z5ooq6HhU3QO5PHNeBWHyrngPEgzj/eQxE3+pSXtr5r9AfnOTVFTzbXWa2 PoqeZxxuE3dnAYwycFCD7YEfYO/bGEjpSSFJ9jL9byia9Nx1194BDpwjPzsApVXUAmxi Be5WgOiyxEmxEibAabvaoBUIDP6CoRuKeHZzV296HHQ3xVMNCh4+e62igODTTRaonbCO 08iIOnOE4azbhw2mWFqRf6k/3m5XpoVmVF104eczxThfZMbIR5mVMdyD18Y6SyHt2MCF TOJQ== X-Gm-Message-State: AOAM530ARJ0XfuMexmKZIYJ9wLCdQbXbc4qvVDsJqXItr/2zhJ+XZCGL f71gg2913lUfkH0CRBq2zQeBk/Xpv9bXXypXSZo= X-Google-Smtp-Source: ABdhPJwoIsfvA35C5GilwqEq4ATGCHqQnGOWw3R1dmBqiPf9k5kX+IAs8XMZt0QJGpwbvBvmprl5b0klEHQFx3TkDu4= X-Received: by 2002:a05:6830:1610:: with SMTP id g16mr3319982otr.345.1608307976593; Fri, 18 Dec 2020 08:12:56 -0800 (PST) MIME-Version: 1.0 References: <20201101193330.24775-1-sorganov@gmail.com> <20201216184929.3924-1-sorganov@gmail.com> <20201216184929.3924-24-sorganov@gmail.com> <87blercju2.fsf@osv.gnss.ru> In-Reply-To: <87blercju2.fsf@osv.gnss.ru> From: Elijah Newren Date: Fri, 18 Dec 2020 08:12:45 -0800 Message-ID: Subject: Re: [PATCH v2 23/33] diff-merges: fix style of functions definitions To: Sergey Organov Cc: Junio C Hamano , Jeff King , Philip Oakley , Git Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Dec 18, 2020 at 5:41 AM Sergey Organov wrote: > > Elijah Newren writes: > > > On Wed, Dec 16, 2020 at 10:50 AM Sergey Organov wrote: > >> > >> Put open curly brace on its own line > >> > >> Signed-off-by: Sergey Organov > >> --- > >> diff-merges.c | 36 ++++++++++++++++++++++++------------ > >> 1 file changed, 24 insertions(+), 12 deletions(-) > >> > >> diff --git a/diff-merges.c b/diff-merges.c > >> index cba391604ac7..0165fa22fcd1 100644 > >> --- a/diff-merges.c > >> +++ b/diff-merges.c > >> @@ -2,7 +2,8 @@ > >> > > [...] > > >> > >> -void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) { > >> +void diff_merges_set_dense_combined_if_unset(struct rev_info *revs) > >> +{ > >> if (!revs->combine_merges) > >> set_dense_combined(revs); > >> } > >> -- > >> 2.25.1 > >> > > > > But...didn't you add all these functions yourself earlier in the > > series? > > Yes, I did indeed and somehow picked wrong style from one of the > occurrences of this style in the existing Git codebase. > > > Why didn't you split this patch up and squash it into the > > relevant previous patches? > > When Junio noticed and pointed to this deficiency, I asked him if I > should fix all the series from the start, or it'd be OK to use fixup > commit. As he didn't answer and nobody else commented either, I opted > for the latter. > > I can still do it if it's that essential, but I'd prefer not to, to > avoid both the hand-work and causing entire series to change. The > problem is that there were code movements in the series, so such a fix > to earlier patches would cause conflicts down the commits chain, to be > resolved by hand. That's what add -p and interactive rebase is for. :-) Code is read more than it is written, so it's important to get things clean. And not just for immediate reviewers, but for people who look at it later.