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=-4.2 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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 5461B1F8C6 for ; Tue, 3 Aug 2021 17:14:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237557AbhHCRO2 (ORCPT ); Tue, 3 Aug 2021 13:14:28 -0400 Received: from cloud.peff.net ([104.130.231.41]:37204 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237830AbhHCROM (ORCPT ); Tue, 3 Aug 2021 13:14:12 -0400 Received: (qmail 1656 invoked by uid 109); 3 Aug 2021 17:13:48 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Tue, 03 Aug 2021 17:13:47 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 15421 invoked by uid 111); 3 Aug 2021 17:13:47 -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, 03 Aug 2021 13:13:47 -0400 Authentication-Results: peff.net; auth=none Date: Tue, 3 Aug 2021 13:13:46 -0400 From: Jeff King To: Elijah Newren Cc: Elijah Newren via GitGitGadget , Git Mailing List , Christian Couder , Derrick Stolee , Emily Shaffer , Eric Sunshine , Johannes Schindelin , Jonathan Nieder , Jonathan Tan , Junio C Hamano , Phillip Wood , =?utf-8?B?UmVuw6k=?= Scharfe , Taylor Blau , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason Subject: Re: [PATCH 0/2] [RFC] Switch default merge backend from recursive to ort Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Aug 03, 2021 at 10:57:12AM -0600, Elijah Newren wrote: > > The nice thing is that the two strategies can co-exist. So if it does > > turn out to have any regressions, it's an easy revert to switch back, > > and even post-release users can switch at runtime. We have pull.twohead, > > but I don't think we have an equivalent that would impact a bare "git > > merge" or "git rebase -m". Maybe it would be worth adding those as an > > escape hatch? > > Actually, pull.twohead is not pull specific; it already affects merge, > rebase (-m is the default for rebase, btw), cherry-pick, and revert. > pull.twohead has affected a bare "git merge" since 1c7b76be7d ("Build > in merge", 2008-07-07). I thought it was weird that "merge strategy" > for the merge command was specified via a config option under "pull", > and included my misgivings about it in the commit message of > 14c4586c2d ("merge,rebase,revert: select ort or recursive by config or > environment", 2020-11-02) when I made sequencer.c pay attention to > that config option as well: > > """ > Also, allow folks to pick the new algorithm via config setting. It > turns out builtin/merge.c already had a way to allow users to specify a > different default merge algorithm: pull.twohead. Rather odd > configuration name (especially to be in the 'pull' namespace rather than > 'merge') but it's there. Add that same configuration to rebase, > cherry-pick, and revert. > """ > > But no one had an alternate suggestion or opinion on attempting to > migrate the configuration to a different name, so it has just stuck. > Anyway, if folks want to try out 'ort' with the 2.32 or 2.33 releases, > they can set pull.twohead=ort. Once we switch the default, they can > set pull.twohead=recursive to get the old default. Ah, thanks for clarifying. I think we are in good shape, then. We could possibly introduce merge.twohead as a synonym, but given that most people would probably not ever even look at this, it may not be worth worrying about. -Peff