From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id F1B1B1F47D for ; Sun, 5 Mar 2023 19:13:15 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=haller-berlin.de header.i=@haller-berlin.de header.a=rsa-sha256 header.s=kas202302241129 header.b=UbTu22LS; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbjCETNJ (ORCPT ); Sun, 5 Mar 2023 14:13:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbjCETNH (ORCPT ); Sun, 5 Mar 2023 14:13:07 -0500 Received: from dd36226.kasserver.com (dd36226.kasserver.com [85.13.153.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 282B66A4B for ; Sun, 5 Mar 2023 11:13:05 -0800 (PST) Received: from [192.168.42.163] (127-98-142-46.pool.kielnet.net [46.142.98.127]) by dd36226.kasserver.com (Postfix) with ESMTPSA id 006F53C26E0; Sun, 5 Mar 2023 20:13:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=haller-berlin.de; s=kas202302241129; t=1678043583; bh=yRswYc/gX+kc35kiSzLfx1Ewx/8n7MEU9yP8brDJvPs=; h=Date:Subject:From:To:References:In-Reply-To:From; b=UbTu22LS8LGZOVgsYXA/RifoCmhZgHZ10GkZ2ZgCRsSXjA2u4vp42XpIl4SWPVmg5 2sGrxfGIvACTPRmjXmJzwQQv3SeVBhJXyy4CJYAnfg5xXHEgx8AMzqiXNPoDfsCViy uPQbyMVgcDLWctY5G122AEOtV8hIvBmMpnvvWMx5VT0U6mBF8eTrCCDTyOdggzsMWH ti3fpHzu383LBJf3S/bRYwrr342TIdkEyzn108lMlMOIPkquCvjUP4LHO0mUT3kmzJ ubP8T8OlCE8d34MHBk3xDXvIxeaP8KLlNQerGO2YlnPKao2Y6aDtKGKdTsw3HnrylE i6VOevd0kCrZA== Message-ID: <97eec89b-6a10-434a-a9aa-54c266da7fb1@haller-berlin.de> Date: Sun, 5 Mar 2023 20:13:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: When exactly should REBASE_HEAD exist? Content-Language: de-DE, en-US From: Stefan Haller To: phillip.wood@dunelm.org.uk, git@vger.kernel.org References: <961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de> <374f83c2-7bf0-38be-26ae-de28340c37d2@dunelm.org.uk> <3ab454f1-2bb5-d990-4cc4-4e2fde2ba294@haller-berlin.de> In-Reply-To: <3ab454f1-2bb5-d990-4cc4-4e2fde2ba294@haller-berlin.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: - Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 05.03.23 17:59, Stefan Haller wrote: > On 05.03.23 15:31, Phillip Wood wrote: >> Hi Stefan >> >> On 02/03/2023 20:27, Stefan Haller wrote: >>> On 02.03.23 11:19, Phillip Wood wrote: >>>> On 28/02/2023 12:55, Stefan Haller wrote: >>>>> The reason why I am asking this is: I'm using lazygit, which, during >>>>> interactive rebases, shows a combined view of the real commits that >>>>> were >>>>> already applied, and the remaining commits that are yet to be applied >>>>> (it gets these by parsing rebase-merge/git-rebase-todo); something like >>>>> this, when I set the 2nd commit to "edit": >>>>> >>>>>     pick   4th commit >>>>>     pick   3rd commit >>>>>            2nd commit  <-- YOU ARE HERE >>>>>            1st commit >>>>> >>>>> This is great, but assuming that the 2nd commit conflicted, currently >>>>> the display looks like this: >>>>> >>>>>     pick   4th commit >>>>>     pick   3rd commit >>>>>            1st commit  <-- YOU ARE HERE >>>>> >>>>> I would like to extend this to also show a "fake entry" for the commit >>>>> that conflicted, if there is one. REBASE_HEAD is perfect for this, >>>>> except that I need a way to distinguish whether it was applied already >>>>> or not. >>>> >>>> Can you check the index for conflicts when the rebase stops? >>> >>> I could do that, but then the fake entry would go away as soon as I have >>> staged all conflict resolutions. I would find it useful for it to stay >>> visible in that case, until I continue the rebase. >> >> I've not used lazygit but looking at the github page it seems that it is >> a persistent process that runs "git rebase". If that's the case I would >> think that you can check for conflicts when the rebase stops and keep >> that value in memory until the rebase is started again. > > I had considered that, but it would be preferable if it were possible to > quit lazygit, start it again, and have it show the same state again. Or > even start the rebase outside of lazygit while it isn't running at all, > and then start it and have it display the correct state. > >> I think your best bet might be to read "$(git rev-parse --git-path >> rebase-merge/done)" the last line of which contains the last todo >> command the rebase tried to execute. > > I'm not sure I understand; you mean in order to distinguish whether it > was a pick or a fixup? OK, I guess it's something like show_fake_entry := REBASE_HEAD exists && (last command in "done" file was not "edit" || "amend" file exists) Is that what you meant? (Minus the bit about rescheduling failed commands, which I still need to wrap my head around...) -Stefan