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.0 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_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 D88331F8C6 for ; Tue, 3 Aug 2021 22:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229942AbhHCWsZ (ORCPT ); Tue, 3 Aug 2021 18:48:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbhHCWsZ (ORCPT ); Tue, 3 Aug 2021 18:48:25 -0400 Received: from mail-ot1-x330.google.com (mail-ot1-x330.google.com [IPv6:2607:f8b0:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4EC0C061757 for ; Tue, 3 Aug 2021 15:48:13 -0700 (PDT) Received: by mail-ot1-x330.google.com with SMTP id 61-20020a9d0d430000b02903eabfc221a9so24349oti.0 for ; Tue, 03 Aug 2021 15:48:13 -0700 (PDT) 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=ia00VthI0n/j/M7CxUug42gSubT9c4mo8ep+vN36NsQ=; b=Ep1vIO10vYQXLXWiLh5kp8N8hGU9ttFbnigFTp/7TqtcuH68i/LNkrg3GeWjnTLlxw bH7Z5T2qBNt3luLjC2xZAeuWZyIQhS9UBqFPStsFzot40v9j9YfmHjjKJZKHigR54X7z fyhsnCacxzfrCnZ5IphJQkPsMuOp66mm8tyWMB2Y0F2hFyqEzZXV2mWJ1DbI9v5hEZkG Z1+jU30yG7glFxGQgvMUqHnOOcDXuZLKTxwSCuCol3FFdH7ZZANVPhTPyqBRa28lJZw1 fOUva5svz5rzKxVn2cHmrWZqQosVhus5YCoefG1W5bz+7YvaPwJR9IyOSkqFkd5mxptL Xvfg== 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=ia00VthI0n/j/M7CxUug42gSubT9c4mo8ep+vN36NsQ=; b=Hkgjq5xQH7OKzJlI2VWq44UH95uS4HbBUwR/JYhaiPEK885j3YU2TFVOm666ZsLF+Q OfuG1Y5/m3LREBrh+zi5zs86VihpObJW68tvFPgKg0eHJFwTla0luwQ9N/AfYalkt2Ng VFlc1RMEo8WeVBDH3whykZkuaVzvoi18RMl/uEoXv+vDk91wu4WrnUHBI0utl4AYywdJ g5+TSZNxPrdKPqAHmmZuOocCO9bbJLPu5RfImSbcmyGy+wQ0Xebn/dKUA6gv/B9Lazll pDK4FW+KxGX0FaLcaMcp6bj8/wJP1INOn7Gv3h5M6JiA7/k2Wgtchf+hmbC8SI1UlcXi TIzg== X-Gm-Message-State: AOAM532NdjSFpHBNnOIDx837R9RfiKDdDCluMqdvkXqpmDgM3dtkfuUj M+5CHihHMOHLRONyDLmXXTCZc8Fgd3uLfnC0fjM= X-Google-Smtp-Source: ABdhPJxIy/KYwGToVB5sOP8TfD6tRZtqSeHRBvtlcqhdizLF0pECjQJASc1OwXjl74WmQHLloW9043+vU8TGDU/sX4k= X-Received: by 2002:a9d:3a08:: with SMTP id j8mr16654956otc.247.1628030893283; Tue, 03 Aug 2021 15:48:13 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Elijah Newren Date: Tue, 3 Aug 2021 16:48:02 -0600 Message-ID: Subject: Re: [PATCH 0/2] [RFC] Switch default merge backend from recursive to ort To: Jeff King Cc: Junio C Hamano , Elijah Newren via GitGitGadget , Git Mailing List , Christian Couder , Derrick Stolee , Emily Shaffer , Eric Sunshine , Johannes Schindelin , Jonathan Nieder , Jonathan Tan , Phillip Wood , =?UTF-8?Q?Ren=C3=A9_Scharfe?= , Taylor Blau , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Aug 3, 2021 at 4:37 PM Jeff King wrote: > > On Tue, Aug 03, 2021 at 03:08:53PM -0700, Junio C Hamano wrote: > > > Jeff King writes: > > > > > It would make sense to me to do the switch in 'next' early in the > > > post-v2.33 cycle. It can cook there for a bit, but I think we have found > > > that it's much more likely to see actual use once it hits 'master'. So I > > > don't see a particular reason to have it sit in 'next' for a long time. > > > We should get as much exposure in 'master' during the v2.34 cycle as > > > possible. > > > > I do not mind queuing what is available today to 'next' to gain 2 > > more weeks of dogfood time during the pre-release freeze. If an > > simple escape hatch that lets us say "anytime we ask ort, use > > recursive instead as an emergency measure" can be added with a > > trivially obvious small patch, that would be a plus. > > Yeah, I am happy even starting the 'next' portion sooner than the > release. :) As Elijah explained, we already have that emergency measure > in place (pull.merge). s/pull.merge/pull.twohead/ Relevant commits: 1c7b76be7d ("Build in merge", 2008-07-07) 14c4586c2d ("merge,rebase,revert: select ort or recursive by config or environment", 2020-11-02)