git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Stefan Haller <lists@haller-berlin.de>, git@vger.kernel.org
Subject: Re: When exactly should REBASE_HEAD exist?
Date: Thu, 2 Mar 2023 10:19:33 +0000	[thread overview]
Message-ID: <374f83c2-7bf0-38be-26ae-de28340c37d2@dunelm.org.uk> (raw)
In-Reply-To: <961e68d7-5f43-c385-10fa-455b8e2f32d0@haller-berlin.de>

Hi Stefan

On 28/02/2023 12:55, Stefan Haller wrote:
> As far as I can tell, REBASE_HEAD always points to the last commit that
> was attempted to be applied in a rebase, not matter whether that attempt
> was successful or not. In other words, when you break in a rebase with
> "edit" or "break", REBASE_HEAD is the same as HEAD 

As you said at the beginning REBASE_HEAD points to the commit that we're 
trying to pick, so it will only be the same as HEAD if the pick was 
successful and it was not rebased onto a new parent. I think it is 
useful to have REBASE_HEAD set when editing a commit as I find it is 
sometimes useful to look at the original commit. I don't think we do (or 
should) set it when rebase stops for a "break" command or a failed 
"exec" command.

>(except when you
> break before the first commit, in that case REBASE_HEAD is unset).
> 
> I wonder whether it would make sense to set REBASE_HEAD only when
> applying a patch failed. That seems to be the main use case of it.

As I mentioned above, I think having it available when editing a commit 
us useful.

> 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?

Best Wishes

Phillip

> I currently do that by comparing it against HEAD, and only showing it
> when they are different. That doesn't always work though, e.g. when I
> amend the current "edit" commit.
> 
> Any better suggestions how to work around this?
> 
> -Stefan
> 

  reply	other threads:[~2023-03-02 10:20 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-28 12:55 When exactly should REBASE_HEAD exist? Stefan Haller
2023-03-02 10:19 ` Phillip Wood [this message]
2023-03-02 20:27   ` Stefan Haller
2023-03-03 10:57     ` Stefan Haller
2023-03-03 21:25       ` Chris Torek
2023-03-04  8:36         ` Stefan Haller
2023-03-06  3:31           ` Chris Torek
2023-03-07 13:16             ` Stefan Haller
2023-03-05 14:33       ` Phillip Wood
2023-03-05 16:58         ` Stefan Haller
2023-03-05 14:31     ` Phillip Wood
2023-03-05 16:59       ` Stefan Haller
2023-03-05 19:13         ` Stefan Haller
2023-03-05 20:15           ` Phillip Wood
2023-03-08 19:02             ` Stefan Haller
2023-03-10  9:56               ` Phillip Wood
2023-03-10 17:42                 ` Stefan Haller
2023-03-16 17:46                   ` Phillip Wood
2023-03-19 14:50                     ` Phillip Wood
2023-03-20  7:29                       ` Stefan Haller
2023-03-20  8:42                         ` Stefan Haller
2023-03-07 18:07 ` Junio C Hamano
2023-03-08 19:02   ` Stefan Haller
2023-03-08 19:40     ` Junio C Hamano
2023-03-09 14:45       ` Stefan Haller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=374f83c2-7bf0-38be-26ae-de28340c37d2@dunelm.org.uk \
    --to=phillip.wood123@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=lists@haller-berlin.de \
    --cc=phillip.wood@dunelm.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).