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.5 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 2EDB51F4B4 for ; Fri, 18 Dec 2020 21:25:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726457AbgLRVYX (ORCPT ); Fri, 18 Dec 2020 16:24:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726173AbgLRVYW (ORCPT ); Fri, 18 Dec 2020 16:24:22 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECBD5C0617A7 for ; Fri, 18 Dec 2020 13:23:41 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id m25so8873343lfc.11 for ; Fri, 18 Dec 2020 13:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Im4U7jI5VJ9thUanW6pw+Cp8BgSArx58HZLhUs6oKyk=; b=qOEyyzJHhEcwdG+BPBSo4reALGEKahlwYcxM4MHpgayyjLOf8ofsRA0sJVOLgy2w+R P2k7j2xWOE6hKQQ/itBN0gtLt+YhgsYrcwyTYM5UBmNRYkA01J5c/wVZUK2NGH9/cr62 cfiq0yRacRBZAfCEBG2woWOLZKlcB8bMoqcSVYZNBIILcvly0JF5Hv0ggafpNkBH5RLq Zz902fQQMUuvDcxVL02l2selfOwHti2yyxwHC9rr+GxmZE9LnpGxwN0le+cshqyqr+/M J6gctwwm3zDElP11GytVnLlOZowYxfeouoUbCMOiyHBXwHPFThxWZ0Wsc9UMchDbczFO SORw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Im4U7jI5VJ9thUanW6pw+Cp8BgSArx58HZLhUs6oKyk=; b=aujHiXOd/fKlou+jd/7CjWFBsDsnsoQHLhUppvfWQgllWv6YZWlg2YvqHGglMVuyMd BkLdZ8ei/kMkkeOt/NJJoRIVb2gCPCaZlj8Y3OYOK5lZvicnYwLBrP4UqOVxppYqnrNm j7Vnm9Uf7Ihd9wsG22mBkaW/Tvq8U9os3h1et5ERqGUkjkCdvFTS7NmsZqfNfDICZlSU 54LkuiGSsvRcSar2m1cjnN6XnhpMiy/Jmn+7ujYSMZEw+uaaWHw4JEU3CcaFplfLiOdm ym7eOKkFL+sjsNdmIZsxcP1lxCua5VwTyl2hr94LIsSalQ3M36zTMGunL/7TcXzMoKgY yuTQ== X-Gm-Message-State: AOAM5336eNFxEwaRNdqYbKja6RynLDl1GNh/3PCXKwy0js0E4hAfmOeN g1eZuAr79zf9RQJu5mZ4I1hcxXNd3Ro= X-Google-Smtp-Source: ABdhPJwzKb1haiV4Rb1RcE1wa3FtYGDqoDRkFoqlZV9LdzjhP71ExuZV07ki6RjARI8bkjZwlX75Ag== X-Received: by 2002:a2e:b5aa:: with SMTP id f10mr2656017ljn.489.1608326620266; Fri, 18 Dec 2020 13:23:40 -0800 (PST) Received: from osv.localdomain ([89.175.180.246]) by smtp.gmail.com with ESMTPSA id z14sm1065636lfq.130.2020.12.18.13.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 13:23:39 -0800 (PST) From: Sergey Organov To: Elijah Newren Cc: Junio C Hamano , Jeff King , Philip Oakley , Git Mailing List Subject: Re: [PATCH v2 23/33] diff-merges: fix style of functions definitions References: <20201101193330.24775-1-sorganov@gmail.com> <20201216184929.3924-1-sorganov@gmail.com> <20201216184929.3924-24-sorganov@gmail.com> <87blercju2.fsf@osv.gnss.ru> Date: Sat, 19 Dec 2020 00:23:38 +0300 In-Reply-To: (Elijah Newren's message of "Fri, 18 Dec 2020 08:12:45 -0800") Message-ID: <871rfm95b9.fsf@osv.gnss.ru> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Elijah Newren writes: > 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. I do know how to do it, but I'd still prefer it to be accepted in its current form, as I don't see this particular case being that important to justify rewriting of all the series. I'll go through the pain if it's a show-stopper though. Thanks, -- Sergey