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,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 6DA311F66F for ; Mon, 2 Nov 2020 19:41:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbgKBTlJ (ORCPT ); Mon, 2 Nov 2020 14:41:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725791AbgKBTlI (ORCPT ); Mon, 2 Nov 2020 14:41:08 -0500 Received: from mail-il1-x143.google.com (mail-il1-x143.google.com [IPv6:2607:f8b0:4864:20::143]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01637C0617A6 for ; Mon, 2 Nov 2020 11:41:08 -0800 (PST) Received: by mail-il1-x143.google.com with SMTP id c11so14011717iln.9 for ; Mon, 02 Nov 2020 11:41:07 -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=4vI79PCYeHno4x9FIbk9m4zrmEPU4+KmyzdoSNMs5KU=; b=EhkZW/2gYHUiPXt97rD1zC7nj+UZYmkLn9t8s5UHEQ0oruuFOhTF+dWm+We6Je126m r6h+hwcg+zgXL9xlw0xy8p4jANvUMu71omxeBlWKbKLKtaXwPU2jNIQMkEWsBbbbXbef ZgJB27sMw8SJlb6wau2dcPsZJDt9g7vkUzRrVLSYCdIjSb50/fxTpJ3KAN6qcux/srnE kfRZLcQqU9FWne80IfPNgtmM+5YAIT5iT72tXt66Zt4LIWumicxyJkiUCHmYIHuKeXXv //QaO8NjojZL8Oz0AF1DOcmXnPIJAnhkB+M8EqYToawcFoTUwUHnpFI90C2+94uD35KF Pxpg== 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=4vI79PCYeHno4x9FIbk9m4zrmEPU4+KmyzdoSNMs5KU=; b=poheCX2bYV3geBb+0ky5zeDkuyDbRzAhX3TRCa5wYF1WklyKln6XbLZ9rO72WmS8gf G8H0pkt5f9Ve7wfURDwig/wCYlwaRLpPn42qXWh+H5/Gx2G9TGMN/v45DchrJGJ4y8gI ljS8OpJYd7JLefMlcjxUQjaCEJg4WSuC3jvwNwczQYK4s2NnLjuMtjb0erG6CTjIVHuH J+6mIYmhLEDN9kzNiXq2GzWJtMwHdkEMI810oIr0Wl7pSnlc/8t+b5wIFcsO1gKy+LmI I+c5hOHMTTO0lp1XdQgfJ4xf0Jq5ElGJqAgMVeYY4j8RNEzFLwy3KXGQYsi7M4FHUzHI plyA== X-Gm-Message-State: AOAM530Myk6EZ1ea5YstPirtX1v3r7ImtZ9CIoqfAExhmRr66omX8+6H 9WxfGESGiKPO0QBwTDH+YRDusQ4jyAhn+yWbhJ0= X-Google-Smtp-Source: ABdhPJxNRnFUeitV5yUcjaxZLoT44paUidkNWiiiMrOxDg01WQt14thUWf5fsZEnd2l1tO9weXGtOVXMEEPVX5+jBfo= X-Received: by 2002:a05:6e02:4ad:: with SMTP id e13mr11015145ils.59.1604346067377; Mon, 02 Nov 2020 11:41:07 -0800 (PST) MIME-Version: 1.0 References: <24f2c4a62317231f4eabed23bb24d345abc9d67e.1603807338.git.gitgitgadget@gmail.com> In-Reply-To: From: "herr.kaste" Date: Mon, 2 Nov 2020 20:40:42 +0100 Message-ID: Subject: Re: [PATCH 1/4] rebase -i: stop overwriting ORIG_HEAD buffer To: Junio C Hamano Cc: Phillip Wood via GitGitGadget , git@vger.kernel.org, Johannes Schindelin , Phillip Wood Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Am Di., 27. Okt. 2020 um 22:10 Uhr schrieb Junio C Hamano : > > My initial impression after seeing the recent report about ORIG_HEAD > was "hmph, these days, rebasing is done on detached HEAD and the > final step updates the target branch only once, so @{1} is much > easier to use---perhaps it is time to deprecate use of ORIG_HEAD?". > After all, ORIG_HEAD was invented way before we had reflog, and > given that one of the goal of reflog was to give more general > recovery mechanism than going back one-step like ORIG_HEAD allowed > us to, and "rebase" were taught to work on detached HEAD to make > @{1} more useful, it would not be too bad to eventually retire > ORIG_HEAD in a distant future, I thought. Phillip pointed out that ORIG_HEAD is actually not save *if* there is a `reset` or `rebase --skip` during the rebase. Otherwise, by design, ORIG_HEAD would be easier to use, as in the form `@{}` two things have to be decided and can go wrong. Wouldn't it be better for the mid-term run to set ORIG_HEAD at the end of the rebase operation, basically during cleanup, and make the commitment that it always points to the right thing for undoing the recent rebase or to compare it (`git diff ORIG_HEAD`) to see possible unwanted merge resolutions. I say mid-term because a `git rebase --undo` with additional safety checks and a `--autostash` for example is IMO the better long-run UX, in a very distant future. > > But it is a good initiative anyway to make ORIG_HEAD again work as > documented. Thanks for working on it. > Regards Caspar Duregger