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=-4.0 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 EF6051F5AE for ; Mon, 3 Aug 2020 20:55:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728671AbgHCUzd (ORCPT ); Mon, 3 Aug 2020 16:55:33 -0400 Received: from cloud.peff.net ([104.130.231.41]:46832 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728400AbgHCUzd (ORCPT ); Mon, 3 Aug 2020 16:55:33 -0400 Received: (qmail 29354 invoked by uid 109); 3 Aug 2020 20:55:33 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Mon, 03 Aug 2020 20:55:33 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 4877 invoked by uid 111); 3 Aug 2020 20:55:32 -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; Mon, 03 Aug 2020 16:55:32 -0400 Authentication-Results: peff.net; auth=none Date: Mon, 3 Aug 2020 16:55:32 -0400 From: Jeff King To: Sergey Organov Cc: Junio C Hamano , git@vger.kernel.org, Chris Torek Subject: Re: [PATCH v2 0/7] making log --first-parent imply -m Message-ID: <20200803205532.GC2715275@coredump.intra.peff.net> References: <20200728163617.GA2649887@coredump.intra.peff.net> <20200729201002.GA2989059@coredump.intra.peff.net> <871rku3soc.fsf@osv.gnss.ru> <20200731230858.GA1461090@coredump.intra.peff.net> <87mu3drynx.fsf@osv.gnss.ru> <87o8nrybnb.fsf@osv.gnss.ru> <20200803180824.GA2711830@coredump.intra.peff.net> <871rknsdo4.fsf@osv.gnss.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <871rknsdo4.fsf@osv.gnss.ru> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Aug 03, 2020 at 11:00:11PM +0300, Sergey Organov wrote: > > It's too late for "-m" to change semantics (we could do a long > > deprecation, but I don't see much point in doing so). > > I thought not of changing semantics of -m. Suppose we introduce > > --diff-merges=(none||c|cc|all) > > before your patch(es). Then your patch would read: "making --first-parent > imply --diff-merges=1" and it'd miss that --[no-]diff-merges part, no? Sure, that would be OK with me. You'd have --diff-merges=none to get the current behavior, and probably make --no-diff-merges an alias for that. > > But --diff-merges is definitely still changeable until we release > > v2.29. My resistance was mostly that I didn't want to complicate my > > series by adding new elements. But we could do something on top. > > Can't we do yours on top instead? I'd expect it'd then be even simpler. Mine is in 'next', so there is no rebuilding it on top of anything else without a revert. But I don't see any particular reason to do that versus just changing the behavior on top. What's in 'next' is generally not rewound, but the behaviors are not cemented with respect to backwards compatibility. -Peff